diff --git a/models/detail.js b/models/detail.js
index 6693c02..5eae791 100644
--- a/models/detail.js
+++ b/models/detail.js
@@ -1,6 +1,6 @@
 const Mongoose = require('mongoose');  
 
-module.exports = new Mongoose.Schema({
+const DetailSchema = new Mongoose.Schema({
   "about": { type: String },
   "age": { type: Number, index: true  },
   "body": { type: String },
@@ -20,3 +20,10 @@ module.exports = new Mongoose.Schema({
   "tested": { type: Date },
   "tribe": { type: String }
 });
+
+const DetailModel = Mongoose.model('details', DetailSchema);
+
+module.exports = {
+  schema: DetailSchema,
+  model: DetailModel
+};
diff --git a/models/message.js b/models/message.js
index a0e86d0..066df59 100644
--- a/models/message.js
+++ b/models/message.js
@@ -1,8 +1,15 @@
 const Mongoose = require('mongoose');  
 
-module.exports = new Mongoose.Schema({
+const MessageSchema = new Mongoose.Schema({
   "order" : { type: Number, default: 0 },
   "text" : { type: String },
   "image" : { type: String },
   "isUser" : { type: Boolean, default: false, required: true, index: true }
 });
+
+const MessageModel = Mongoose.model('messages', MessageSchema);
+
+module.exports = {
+  schema: MessageSchema,
+  model: MessageModel
+};
diff --git a/models/profile.js b/models/profile.js
index 257a145..85b3f89 100644
--- a/models/profile.js
+++ b/models/profile.js
@@ -1,6 +1,6 @@
 const fs = require('fs');
-const DetailSchema = require('../models/detail');
-const MessageSchema = require('../models/message');
+const Details = require('../models/detail');
+const Messages = require('../models/message');
 const Mongoose = require('mongoose');  
 const ShortId = require('shortid');
 
@@ -12,8 +12,8 @@ const ATTACHMENT_SUFFIX_THUMBNAIL = '_thumbnail';
  
 const ProfileSchema = new Mongoose.Schema({
   "order" : { type: Number, default: 0 },
-  "details": { type: DetailSchema },
-  "messages" : [ { type: MessageSchema } ]
+  "details": { type: Details.schema },
+  "messages" : [ { type: Messages.schema } ]
 });
 
 const ProfileModel = Mongoose.model('profiles', ProfileSchema);