diff --git a/src/OrbitDB.js b/src/OrbitDB.js
index bc3fdab..fbb0f8d 100644
--- a/src/OrbitDB.js
+++ b/src/OrbitDB.js
@@ -56,13 +56,20 @@ class OrbitDB {
     // testing with orbit-db-access-controller
     AccessControllers = options.AccessControllers || AccessControllers
   }
-  
-  static get Pubsub () { return Pubsub; }
-  static get Cache () { return Cache; }
-  static get Keystore () { return Keystore; }
-  static get Identities () { return Identities; }
-  static get AccessControllers () { return AccessControllers; }
-  static get Storage () { return Storage; }
+
+  static get Pubsub () { return Pubsub }
+  static get Cache () { return Cache }
+  static get Keystore () { return Keystore }
+  static get Identities () { return Identities }
+  static get AccessControllers () { return AccessControllers }
+  static get Storage () { return Storage }
+  static get OrbitDBAddress () { return OrbitDBAddress }
+
+  static get EventStore () { return EventStore }
+  static get FeedStore () { return FeedStore }
+  static get KeyValueStore () { return KeyValueStore }
+  static get CounterStore () { return CounterStore; }
+  static get DocumentStore () { return DocumentStore; }
 
   get cache () { return this.caches[this.directory].cache }