diff --git a/src/server/entities/entity.js b/src/server/entities/entity.js
index cdcd4c6..8992eb3 100644
--- a/src/server/entities/entity.js
+++ b/src/server/entities/entity.js
@@ -1,3 +1,5 @@
+var history = require('./history');
+
 exports = module.exports = Entity;
 
 function Entity (id) {
@@ -10,12 +12,13 @@ function Entity (id) {
 Entity.prototype = {
     addState: function (state, executionTime) {
         this.addHistory(state, executionTime);
+        this.state = state;
         this.sequence += 1;
     },
     addHistory: function (state, executionTime) {
-        var minTime, spliceTo = 0;
-        this.state = state;
-        this.stateHistory.push({ state: state, executionTime: executionTime });
+        var minTime, spliceTo = 0, newHistory = new history(state, executionTime);
+
+        this.stateHistory.push(newHistory);
         minTime = this.stateHistory[this.stateHistory.length - 1].executionTime - 1000;
 
         for (var i = 0; i < this.stateHistory.length; i ++) {
diff --git a/src/server/entities/history.js b/src/server/entities/history.js
new file mode 100644
index 0000000..2c710ce
--- /dev/null
+++ b/src/server/entities/history.js
@@ -0,0 +1,6 @@
+exports = module.exports = History;
+
+function History (state, executionTime) {
+    this.state = state;
+    this.executionTime = executionTime;
+}