diff --git a/trustgraph-base/trustgraph/schema/knowledge.py b/trustgraph-base/trustgraph/schema/knowledge.py
index 89bf6036..b663ac35 100644
--- a/trustgraph-base/trustgraph/schema/knowledge.py
+++ b/trustgraph-base/trustgraph/schema/knowledge.py
@@ -1,5 +1,5 @@
 
-from pulsar.schema import Record, Bytes, String, Array, Long
+from pulsar.schema import Record, Bytes, String, Array, Long, Boolean
 from . types import Triple
 from . topic import topic
 from . types import Error
diff --git a/trustgraph-flow/scripts/kg-manager b/trustgraph-flow/scripts/kg-manager
new file mode 100644
index 00000000..ee8ec923
--- /dev/null
+++ b/trustgraph-flow/scripts/kg-manager
@@ -0,0 +1,6 @@
+#!/usr/bin/env python3
+
+from trustgraph.cores import run
+
+run()
+
diff --git a/trustgraph-flow/setup.py b/trustgraph-flow/setup.py
index 05a72a55..b4598b64 100644
--- a/trustgraph-flow/setup.py
+++ b/trustgraph-flow/setup.py
@@ -96,6 +96,7 @@ setuptools.setup(
         "scripts/kg-extract-relationships",
         "scripts/kg-extract-topics",
         "scripts/kg-store",
+        "scripts/kg-manager",
         "scripts/librarian",
         "scripts/metering",
         "scripts/object-extract-row",
diff --git a/trustgraph-flow/trustgraph/cores/knowledge.py b/trustgraph-flow/trustgraph/cores/knowledge.py
index 5c5a83fe..148f193c 100644
--- a/trustgraph-flow/trustgraph/cores/knowledge.py
+++ b/trustgraph-flow/trustgraph/cores/knowledge.py
@@ -2,7 +2,7 @@
 from .. schema import KnowledgeResponse, Error, Triple
 from .. knowledge import hash
 from .. exceptions import RequestError
-from . table_store import TableStore
+from .. tables.knowledge import KnowledgeTableStore
 from . blob_store import BlobStore
 import base64
 
@@ -15,7 +15,7 @@ class KnowledgeManager:
             keyspace,
     ):
 
-        self.table_store = TableStore(
+        self.table_store = KnowledgeTableStore(
             cassandra_host, cassandra_user, cassandra_password, keyspace
         )
 
diff --git a/trustgraph-flow/trustgraph/librarian/librarian.py b/trustgraph-flow/trustgraph/librarian/librarian.py
index 7c09515a..3247c38e 100644
--- a/trustgraph-flow/trustgraph/librarian/librarian.py
+++ b/trustgraph-flow/trustgraph/librarian/librarian.py
@@ -2,7 +2,7 @@
 from .. schema import LibrarianRequest, LibrarianResponse, Error, Triple
 from .. knowledge import hash
 from .. exceptions import RequestError
-from . table_store import TableStore
+from .. tables.library import LibraryTableStore
 from . blob_store import BlobStore
 import base64
 
diff --git a/trustgraph-flow/trustgraph/storage/knowledge/store.py b/trustgraph-flow/trustgraph/storage/knowledge/store.py
index 4470f5a5..62e915be 100644
--- a/trustgraph-flow/trustgraph/storage/knowledge/store.py
+++ b/trustgraph-flow/trustgraph/storage/knowledge/store.py
@@ -9,7 +9,7 @@ import urllib.parse
 from ... schema import Triples, GraphEmbeddings
 from ... base import FlowProcessor, ConsumerSpec
 
-from . table_store import TableStore
+from ... tables.knowledge import KnowledgeTableStore
 
 default_ident = "kg-store"
 
@@ -50,7 +50,7 @@ class Processor(FlowProcessor):
             )
         )
 
-        self.table_store = TableStore(
+        self.table_store = KnowledgeTableStore(
             cassandra_host = cassandra_host.split(","),
             cassandra_user = cassandra_user,
             cassandra_password = cassandra_password,
diff --git a/trustgraph-flow/trustgraph/tables/knowledge_tables.py b/trustgraph-flow/trustgraph/tables/knowledge.py
similarity index 99%
rename from trustgraph-flow/trustgraph/tables/knowledge_tables.py
rename to trustgraph-flow/trustgraph/tables/knowledge.py
index 8a75e622..628c3fae 100644
--- a/trustgraph-flow/trustgraph/tables/knowledge_tables.py
+++ b/trustgraph-flow/trustgraph/tables/knowledge.py
@@ -7,7 +7,7 @@ import uuid
 import time
 import asyncio
 
-class TableStore:
+class KnowledgeTableStore:
 
     def __init__(
             self,
diff --git a/trustgraph-flow/trustgraph/tables/library_tables.py b/trustgraph-flow/trustgraph/tables/library.py
similarity index 99%
rename from trustgraph-flow/trustgraph/tables/library_tables.py
rename to trustgraph-flow/trustgraph/tables/library.py
index f6de0a74..4168fd2b 100644
--- a/trustgraph-flow/trustgraph/tables/library_tables.py
+++ b/trustgraph-flow/trustgraph/tables/library.py
@@ -14,7 +14,7 @@ import uuid
 import time
 import asyncio
 
-class TableStore:
+class LibraryTableStore:
 
     def __init__(
             self,