diff --git a/package.json b/package.json
index 32b6380..e262f2e 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
   ],
   "license": "MIT",
   "dependencies": {
+    "interface-datastore": "^0.8.1",
     "orbit-db-store": "~3.1.0"
   },
   "localMaintainers": [
diff --git a/src/KeyValueStore.js b/src/KeyValueStore.js
index 7ecc8a6..0ad6337 100644
--- a/src/KeyValueStore.js
+++ b/src/KeyValueStore.js
@@ -2,6 +2,8 @@
 
 const Store = require('orbit-db-store')
 const KeyValueIndex = require('./KeyValueIndex')
+const {Key, utils} = require('interface-datastore')
+const {filter, sortAll, take, map} = utils
 
 class KeyValueStore extends Store {
   constructor(ipfs, id, dbname, options) {
@@ -16,28 +18,102 @@ class KeyValueStore extends Store {
   }
 
   get (key) {
-    return this._index.get(key)
+    return this._index.get(key.toString())
   }
 
   set (key, data, options = {}) {
-    return this.put(key, data, options)
+    return this.put(key.toString(), data, options)
   }
 
   put (key, data, options = {}) {
     return this._addOperation({
       op: 'PUT',
-      key: key,
+      key: key.toString(),
       value: data
     }, options)
   }
-
   del (key, options = {}) {
     return this._addOperation({
       op: 'DEL',
-      key: key,
+      key: key.toString(),
       value: null
     }, options)
   }
+  /**
+   * Returns whether a key-value exists with a specific key.
+   * NOTE: In compliance with interface-datastore specifications.
+   * @param {String|Key} key 
+   * @returns {Boolean}
+   */
+  async has(key) {
+    if(this._index._index[key.toString()]) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+  /**
+   * Query datastore via async iterable
+   * NOTE: In compliance with interface-datastore specifications. Backwards compatible (without leading /) orbit-db keyvalues may NOT work as expected.
+   * @param {Object} q 
+   * @returns {AsyncIterable}
+   */
+  query (q) {
+    let it = Object.entries(this._index._index)
+
+    it = map(it, entry => ({ key: new Key(entry[0]), value: entry[1] }))
+
+    if (q.prefix != null) {
+      it = filter(it, e => e.key.toString().startsWith(q.prefix))
+    }
+
+    if (Array.isArray(q.filters)) {
+      it = q.filters.reduce((it, f) => filter(it, f), it)
+    }
+
+    if (Array.isArray(q.orders)) {
+      it = q.orders.reduce((it, f) => sortAll(it, f), it)
+    }
+
+    if (q.offset != null) {
+      let i = 0
+      it = filter(it, () => i++ >= q.offset)
+    }
+
+    if (q.limit != null) {
+      it = take(it, q.limit)
+    }
+
+    if (q.keysOnly === true) {
+      it = map(it, e => ({ key: e.key }))
+    }
+
+    return it
+  }
+  batch () {
+    let puts = []
+    let dels = []
+
+    return {
+      put (key, value) {
+        puts.push([key, value])
+      },
+      delete (key) {
+        dels.push(key)
+      },
+      commit: async () => { // eslint-disable-line require-await
+        //Future add support for multiples operations per oplog entry.
+        for(var v of puts) {
+          await this.put(v[0], v[1])
+        }
+        puts = []
+        for(var key of dels) {
+          await this.del(key)
+        }
+        dels = []
+      }
+    }
+  }
 }
 
 module.exports = KeyValueStore