diff --git a/trustgraph-base/trustgraph/schema/library.py b/trustgraph-base/trustgraph/schema/library.py
index 36a4701a..63900c3a 100644
--- a/trustgraph-base/trustgraph/schema/library.py
+++ b/trustgraph-base/trustgraph/schema/library.py
@@ -69,6 +69,7 @@ class DocumentMetadata(Record):
     title = String()
     comments = String()
     metadata = Array(Triple())
+    user = String()
     tags = Array(String())
 
 class ProcessingMetadata(Record):
@@ -91,8 +92,6 @@ class LibrarianRequest(Record):
     # list-processing
     operation = String()
 
-    user = String()
-
     # add-document, remove-document, update-document, get-document-metadata,
     # get-document-content
     document_id = String()
diff --git a/trustgraph-flow/trustgraph/gateway/dispatch/serialize.py b/trustgraph-flow/trustgraph/gateway/dispatch/serialize.py
index 8f1eba41..cc869dec 100644
--- a/trustgraph-flow/trustgraph/gateway/dispatch/serialize.py
+++ b/trustgraph-flow/trustgraph/gateway/dispatch/serialize.py
@@ -102,6 +102,9 @@ def serialize_document_metadata(message):
     if message.metadata:
         ret["metadata"] = serialize_subgraph(message.metadata)
 
+    if message.kind:
+        ret["user"] = message.user
+
     if message.tags:
         ret["tags"] = message.tags
 
@@ -140,6 +143,7 @@ def to_document_metadata(x):
         title = x.get("title", None),
         comments = x.get("comments", None),
         metadata = to_subgraph(x["metadata"]),
+        user = x.get("user", None),
         tags = x.get("tags", None),
     )
 
@@ -159,3 +163,4 @@ def to_criteria(x):
         Critera(v["key"], v["value"], v["operator"])
         for v in x
     ]
+