diff --git a/app-backend/built/datastore/DataStoreProvider.js b/app-backend/built/datastore/DataStoreProvider.js
index bafe2b0..d184e59 100644
--- a/app-backend/built/datastore/DataStoreProvider.js
+++ b/app-backend/built/datastore/DataStoreProvider.js
@@ -1,17 +1,18 @@
+"use strict";
 /**
  * Created by kasra on 27/06/17.
  */
-const DataStore = require('./DataStoreImpl');
+const DataStore = require("./DataStoreImpl");
 const dataStoreCache = {};
 module.exports = {
     getDataStore: function (namespace) {
         if (!namespace) {
-            return null;
+            throw new Error("NameSpace is empty");
         }
         if (!dataStoreCache[namespace]) {
             dataStoreCache[namespace] = new DataStore(namespace);
         }
         return dataStoreCache[namespace];
-    }
+    },
 };
 //# sourceMappingURL=DataStoreProvider.js.map
\ No newline at end of file
diff --git a/app-backend/built/datastore/DataStoreProvider.js.map b/app-backend/built/datastore/DataStoreProvider.js.map
index a9fb3e2..73c0063 100644
--- a/app-backend/built/datastore/DataStoreProvider.js.map
+++ b/app-backend/built/datastore/DataStoreProvider.js.map
@@ -1 +1 @@
-{"version":3,"file":"DataStoreProvider.js","sourceRoot":"","sources":["../../src/datastore/DataStoreProvider.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,SAAS,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAC7C,MAAM,cAAc,GAAG,EAAE,CAAC;AAE1B,MAAM,CAAC,OAAO,GAAG;IAEb,YAAY,EAAE,UAAU,SAAS;QAE7B,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO,IAAI,CAAC;SACf;QAED,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;YAC5B,cAAc,CAAC,SAAS,CAAC,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC;SACxD;QAED,OAAO,cAAc,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC;CAEJ,CAAC"}
\ No newline at end of file
+{"version":3,"file":"DataStoreProvider.js","sourceRoot":"","sources":["../../src/datastore/DataStoreProvider.ts"],"names":[],"mappings":";AAAA;;GAEG;AAEH,6CAA8C;AAK9C,MAAM,cAAc,GAAW,EAAE,CAAC;AAElC,iBAAS;IACL,YAAY,EAAE,UAAS,SAAiB;QACpC,IAAI,CAAC,SAAS,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACzC;QAED,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;YAC5B,cAAc,CAAC,SAAS,CAAC,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC;SACxD;QAED,OAAO,cAAc,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC;CACJ,CAAC"}
\ No newline at end of file
diff --git a/app-backend/src/datastore/DataStoreProvider.js b/app-backend/src/datastore/DataStoreProvider.js
deleted file mode 100644
index 3604e48..0000000
--- a/app-backend/src/datastore/DataStoreProvider.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Created by kasra on 27/06/17.
- */
-
-const DataStore = require('./DataStoreImpl');
-const dataStoreCache = {};
-
-module.exports = {
-
-    getDataStore: function (namespace) {
-
-        if (!namespace) {
-            return null;
-        }
-
-        if (!dataStoreCache[namespace]) {
-            dataStoreCache[namespace] = new DataStore(namespace);
-        }
-
-        return dataStoreCache[namespace];
-    }
-
-};
\ No newline at end of file
diff --git a/app-backend/src/datastore/DataStoreProvider.ts b/app-backend/src/datastore/DataStoreProvider.ts
new file mode 100644
index 0000000..8a47d79
--- /dev/null
+++ b/app-backend/src/datastore/DataStoreProvider.ts
@@ -0,0 +1,24 @@
+/**
+ * Created by kasra on 27/06/17.
+ */
+
+import DataStore = require("./DataStoreImpl");
+
+interface ICache {
+    [namespace: string]: DataStore;
+}
+const dataStoreCache: ICache = {};
+
+export = {
+    getDataStore: function(namespace: string) {
+        if (!namespace) {
+            throw new Error("NameSpace is empty");
+        }
+
+        if (!dataStoreCache[namespace]) {
+            dataStoreCache[namespace] = new DataStore(namespace);
+        }
+
+        return dataStoreCache[namespace];
+    },
+};