diff --git a/trustgraph-base/trustgraph/schema/documents.py b/trustgraph-base/trustgraph/schema/documents.py
index 2a3d3d0c..79173126 100644
--- a/trustgraph-base/trustgraph/schema/documents.py
+++ b/trustgraph-base/trustgraph/schema/documents.py
@@ -37,12 +37,15 @@ chunk_ingest_queue = topic('chunk-load')
 
 # Chunk embeddings are an embeddings associated with a text chunk
 
-class ChunkEmbeddings(Record):
-    metadata = Metadata()
-    vectors = Array(Array(Double()))
-    chunk = Bytes()
+class EntityContext(Record):
+    entity = Value()
+    context = String()
 
-chunk_embeddings_ingest_queue = topic('chunk-embeddings-load')
+class EntityContexts(Record):
+    metadata = Metadata()
+    entities = Array(EntityContext())
+
+entity_contexts_ingest_queue = topic('entity-contexts-load')
 
 ############################################################################
 
diff --git a/trustgraph-base/trustgraph/schema/graph.py b/trustgraph-base/trustgraph/schema/graph.py
index 78c1a99c..ea4867c6 100644
--- a/trustgraph-base/trustgraph/schema/graph.py
+++ b/trustgraph-base/trustgraph/schema/graph.py
@@ -9,10 +9,13 @@ from . metadata import Metadata
 
 # Graph embeddings are embeddings associated with a graph entity
 
+class EntityEmbeddings(Record):
+    entity = Value()
+    vectors = Array(Array(Double()))
+
 class GraphEmbeddings(Record):
     metadata = Metadata()
-    vectors = Array(Array(Double()))
-    entity = Value()
+    entities = Array(EntityEmbeddings())
 
 graph_embeddings_store_queue = topic('graph-embeddings-store')