diff --git a/data/index.js b/data/index.js
index b105582..9314b59 100644
--- a/data/index.js
+++ b/data/index.js
@@ -3,9 +3,16 @@ module.exports = function(config) {
   var knex = require('knex')(config);
 
   return {
-    getEntity: function (table, where) {
+    getEntity: function (message) {
 
-      return knex(table).where(where).select('*');
+      return new Promise(function(resolve, reject) {
+
+        knex(message.tableName).where(message.where).select('*').then(function (data) {
+
+          message.data = data[0];
+          resolve(message);
+        });
+      });
     }
   }
 }
diff --git a/index.js b/index.js
index 2b28718..a7f9a50 100644
--- a/index.js
+++ b/index.js
@@ -22,9 +22,7 @@ client.on('open', function open() {
     switch (message.action) {
       case 'getEntity':
 
-        data.getEntity(message.tableName, message.where || {}).then(function(data) {
-
-          message.data = data[0];
+        data.getEntity(message).then(function(message) {
 
           client.send(JSON.stringify(message));
         });