diff --git a/app/abilities/strain.js b/app/abilities/strain.js
index 1b18e18..ba12463 100644
--- a/app/abilities/strain.js
+++ b/app/abilities/strain.js
@@ -11,7 +11,7 @@ export default Ability.extend({
   canEdit: function() {
     let role = this.get('session.currentUser.role');
     let id = this.get('session.currentUser.id');
-    let author = this.get('model.author');
+    let author = this.get('model.createdBy');
     return (role === 'W' && (+id === author)) || (role === 'A');
-  }.property('session.currentUser.role', 'session.currentUser.id', 'model.author')
+  }.property('session.currentUser.role', 'session.currentUser.id', 'model.createdBy')
 });
diff --git a/app/models/characteristic.js b/app/models/characteristic.js
index 9eb46ce..2ab12f2 100644
--- a/app/models/characteristic.js
+++ b/app/models/characteristic.js
@@ -7,5 +7,8 @@ export default DS.Model.extend({
   measurements: DS.hasMany('measurements'),
   createdAt: DS.attr('date'),
   updatedAt: DS.attr('date'),
-  deletedAt: DS.attr('date')
+  deletedAt: DS.attr('date'),
+  createdBy: DS.attr('number'),
+  updatedBy: DS.attr('number'),
+  deletedBy: DS.attr('number')
 });
diff --git a/app/models/measurement.js b/app/models/measurement.js
index aa0e80b..de2b93b 100644
--- a/app/models/measurement.js
+++ b/app/models/measurement.js
@@ -13,6 +13,8 @@ export default DS.Model.extend({
   testMethod: DS.attr('string'),
   createdAt: DS.attr('date'),
   updatedAt: DS.attr('date'),
+  createdBy: DS.attr('number'),
+  updatedBy: DS.attr('number'),
   computedType: Ember.computed('textMeasurementType', 'txtValue', 'numValue', function() {
     if (this.get('textMeasurementType') && !this.get('txtValue') && !this.get('numValue')) {
       return 'Fixed-text';
diff --git a/app/models/strain.js b/app/models/strain.js
index 16ccb4d..71bf4ce 100644
--- a/app/models/strain.js
+++ b/app/models/strain.js
@@ -13,7 +13,9 @@ export default DS.Model.extend({
   createdAt: DS.attr('date'),
   updatedAt: DS.attr('date'),
   deletedAt: DS.attr('date'),
-  author: DS.attr('number'),
+  createdBy: DS.attr('number'),
+  updatedBy: DS.attr('number'),
+  deletedBy: DS.attr('number'),
   totalMeasurements: DS.attr('number'),
   fullName: Ember.computed('speciesName', 'strainName', function() {
     return this.get('speciesName') + ' (' + this.get('strainName') + ')';
diff --git a/server/mocks/characteristics.js b/server/mocks/characteristics.js
index d6e3813..ba312f4 100644
--- a/server/mocks/characteristics.js
+++ b/server/mocks/characteristics.js
@@ -11,7 +11,10 @@ module.exports = function(app) {
       measurements: [1],
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z",
-      deletedAt: null
+      deletedAt: null,
+      createdBy: 1,
+      updatedBy: 1,
+      deletedBy: null
     },
     {
       id: 2,
@@ -21,7 +24,10 @@ module.exports = function(app) {
       measurements: [2],
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z",
-      deletedAt: null
+      deletedAt: null,
+      createdBy: 1,
+      updatedBy: 1,
+      deletedBy: null
     },
     {
       id: 3,
@@ -31,7 +37,10 @@ module.exports = function(app) {
       measurements: [3],
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z",
-      deletedAt: null
+      deletedAt: null,
+      createdBy: 1,
+      updatedBy: 1,
+      deletedBy: null
     }
   ]
 
diff --git a/server/mocks/measurements.js b/server/mocks/measurements.js
index c8cc643..102ee0c 100644
--- a/server/mocks/measurements.js
+++ b/server/mocks/measurements.js
@@ -15,7 +15,9 @@ module.exports = function(app) {
       notes: null,
       testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
-      updatedAt: "0001-01-01T00:00:00Z"
+      updatedAt: "0001-01-01T00:00:00Z",
+      createdBy: 1,
+      updatedBy: 1
     },
     {
       id: 2,
@@ -29,7 +31,9 @@ module.exports = function(app) {
       notes: null,
       testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
-      updatedAt: "0001-01-01T00:00:00Z"
+      updatedAt: "0001-01-01T00:00:00Z",
+      createdBy: 1,
+      updatedBy: 1
     },
     {
       id: 3,
@@ -43,7 +47,9 @@ module.exports = function(app) {
       notes: "some notes",
       testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
-      updatedAt: "0001-01-01T00:00:00Z"
+      updatedAt: "0001-01-01T00:00:00Z",
+      createdBy: 1,
+      updatedBy: 1
     },
     {
       id: 4,
@@ -57,7 +63,9 @@ module.exports = function(app) {
       notes: null,
       testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
-      updatedAt: "0001-01-01T00:00:00Z"
+      updatedAt: "0001-01-01T00:00:00Z",
+      createdBy: 1,
+      updatedBy: 1
     },
     {
       id: 5,
@@ -71,7 +79,9 @@ module.exports = function(app) {
       notes: null,
       testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
-      updatedAt: "0001-01-01T00:00:00Z"
+      updatedAt: "0001-01-01T00:00:00Z",
+      createdBy: 1,
+      updatedBy: 1
     },
     {
       id: 6,
@@ -85,7 +95,9 @@ module.exports = function(app) {
       notes: null,
       testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
-      updatedAt: "0001-01-01T00:00:00Z"
+      updatedAt: "0001-01-01T00:00:00Z",
+      createdBy: 1,
+      updatedBy: 1
     },
     {
       id: 7,
@@ -99,7 +111,9 @@ module.exports = function(app) {
       notes: null,
       testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
-      updatedAt: "0001-01-01T00:00:00Z"
+      updatedAt: "0001-01-01T00:00:00Z",
+      createdBy: 1,
+      updatedBy: 1
     },
     {
       id: 8,
@@ -113,7 +127,9 @@ module.exports = function(app) {
       notes: "some notes",
       testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
-      updatedAt: "0001-01-01T00:00:00Z"
+      updatedAt: "0001-01-01T00:00:00Z",
+      createdBy: 1,
+      updatedBy: 1
     },
     {
       id: 9,
@@ -127,7 +143,9 @@ module.exports = function(app) {
       notes: null,
       testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
-      updatedAt: "0001-01-01T00:00:00Z"
+      updatedAt: "0001-01-01T00:00:00Z",
+      createdBy: 1,
+      updatedBy: 1
     },
     {
       id: 10,
@@ -141,7 +159,9 @@ module.exports = function(app) {
       notes: null,
       testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
-      updatedAt: "0001-01-01T00:00:00Z"
+      updatedAt: "0001-01-01T00:00:00Z",
+      createdBy: 1,
+      updatedBy: 1
     }
   ]
 
diff --git a/server/mocks/strains.js b/server/mocks/strains.js
index f5e5e6c..21c0e71 100644
--- a/server/mocks/strains.js
+++ b/server/mocks/strains.js
@@ -15,7 +15,9 @@ module.exports = function(app) {
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z",
       deletedAt: null,
-      author: 1,
+      createdBy: 1,
+      updatedBy: 1,
+      deletedBy: null,
       totalMeasurements: 5,
       notes: "Test notes",
     },
@@ -31,7 +33,9 @@ module.exports = function(app) {
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z",
       deletedAt: null,
-      author: 3,
+      createdBy: 3,
+      updatedBy: 3,
+      deletedBy: null,
       totalMeasurements: 5,
       notes: "Test notes",
     },
@@ -47,7 +51,9 @@ module.exports = function(app) {
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z",
       deletedAt: null,
-      author: 1,
+      createdBy: 1,
+      updatedBy: 1,
+      deletedBy: null,
       totalMeasurements: 0,
       notes: "Test notes",
     },
@@ -63,7 +69,9 @@ module.exports = function(app) {
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z",
       deletedAt: null,
-      author: 3,
+      createdBy: 3,
+      updatedBy: 3,
+      deletedBy: null,
       totalMeasurements: 0,
       notes: "Test notes",
     }