diff --git a/src/server/garageserver.io.js b/src/server/garageserver.io.js
index 41d228f..ddf34dc 100644
--- a/src/server/garageserver.io.js
+++ b/src/server/garageserver.io.js
@@ -19,8 +19,8 @@ api methods
     createGarageServer(io, options)
     start()
     stop()
-    getPlayers() : [player] : { id: '', state: {}, inputs: [{}], stateHistory: [{ state, executionTime }] }
-    getEntities() : [entity] : { id: '', state: {}, stateHistory: [{ state, executionTime }] }
+    getPlayers() : [{ id: '', state: {}, inputs: [{}], stateHistory: [{ state, executionTime }] }]
+    getEntities() : [{ id: '', state: {}, stateHistory: [{ state, executionTime }] }]
     updatePlayerState(id, state)
     updateEntityState(id, state)
     addEntity(id)
diff --git a/src/server/garageservergame.js b/src/server/garageservergame.js
index 6219366..e03c0c7 100644
--- a/src/server/garageservergame.js
+++ b/src/server/garageservergame.js
@@ -44,11 +44,19 @@ GarageServerGame.prototype.getState = function (controller) {
 };
 
 GarageServerGame.prototype.getPlayers = function () {
-    return this.playerController.entities;
+    var list = [];
+    this.playerController.entities.forEach(function (player) {
+        list.push({ id: player.id, state: player.state, inputs: player.inputs, stateHistory: player.stateHistory });
+    });
+    return list;
 };
 
 GarageServerGame.prototype.getEntities = function () {
-    return this.entityController.entities;
+    var list = [];
+    this.entityController.entities.forEach(function (entity) {
+        list.push({ id: entity.id, state: entity.state, stateHistory: entity.stateHistory });
+    });
+    return list;
 };
 
 GarageServerGame.prototype.getPlayer = function (id) {