diff --git a/packages/rocketchat-lib/package.js b/packages/rocketchat-lib/package.js
index eba0e5e1e2af8ced81f4e890d17f40cacc07d41d..bb2261f89f0dcc516faa9480b822b9c813eca802 100644
--- a/packages/rocketchat-lib/package.js
+++ b/packages/rocketchat-lib/package.js
@@ -72,6 +72,7 @@ Package.onUse(function(api) {
 	api.addFiles('server/models/Subscriptions.coffee', 'server');
 	api.addFiles('server/models/Rooms.coffee', 'server');
 	api.addFiles('server/models/Messages.coffee', 'server');
+	api.addFiles('server/models/Reports.coffee', 'server');
 
 	// TAPi18n -- needs to be added last
 	api.addFiles(tapi18nFiles, ["client", "server"]);
diff --git a/packages/rocketchat-lib/server/models/Reports.coffee b/packages/rocketchat-lib/server/models/Reports.coffee
new file mode 100644
index 0000000000000000000000000000000000000000..759323ac8f2f40add989b5b0c522f58af355236c
--- /dev/null
+++ b/packages/rocketchat-lib/server/models/Reports.coffee
@@ -0,0 +1,17 @@
+RocketChat.models.Reports = new class asd extends RocketChat.models._Base
+	constructor: ->
+		@model = new Meteor.Collection 'rocketchat_reports'
+
+
+	# INSERT
+	createWithMessageDescriptionAndUserId: (message, description, userId, extraData) ->
+		record =
+			message: message
+			description: description
+			ts: new Date()
+			userId: userId
+
+		_.extend record, extraData
+
+		record._id = @insert record
+		return record
diff --git a/server/lib/collections.coffee b/server/lib/collections.coffee
deleted file mode 100644
index 6024a7623c9e27b0783e1afdb7dd284e30d7c47a..0000000000000000000000000000000000000000
--- a/server/lib/collections.coffee
+++ /dev/null
@@ -1 +0,0 @@
-@ChatReports = new Meteor.Collection 'rocketchat_reports'
diff --git a/server/methods/reportMessage.coffee b/server/methods/reportMessage.coffee
index 00140ec678e26b9b81d7468c39ad8c5694095931..193ee7ebaf33767f95213f2540c598e78014e524 100644
--- a/server/methods/reportMessage.coffee
+++ b/server/methods/reportMessage.coffee
@@ -6,8 +6,4 @@ Meteor.methods
 		if not description? or description.trim() is ''
 			throw new Meteor.Error 'invalid-description', "[methods] reportMessage -> Invalid description"
 
-		ChatReports.insert
-			message: message
-			description: description
-			ts: new Date()
-			userId: Meteor.userId()
+		RocketChat.models.Reports.createWithMessageDescriptionAndUserId message, description, Meteor.userId()