diff --git a/invana_engine/core/schema_generator.py b/invana_engine/core/schema_generator.py
index e9f6b75..5179289 100644
--- a/invana_engine/core/schema_generator.py
+++ b/invana_engine/core/schema_generator.py
@@ -296,7 +296,7 @@ def create_label_fields_of_search_type(self, search_type):
 
     # def create_label_fields_of_label(self, record, )
 
-    def create_schema_dynamically(self):
+    def create_schema_dynamically(self, *extra_schema_types):
         types = []
         query_schemas = []
         for search_type in ["node", "edge"]:
@@ -318,7 +318,7 @@ def create_schema_dynamically(self):
         # class Query(ModellerQuery, GraphSchema, *query_schemas):
         #     pass
 
-        class Query(*query_schemas):
+        class Query(*extra_schema_types, *query_schemas):
             pass
 
         return graphene.Schema(query=Query,
diff --git a/invana_engine/server/schema.py b/invana_engine/server/schema.py
index a74195d..1eb336d 100644
--- a/invana_engine/server/schema.py
+++ b/invana_engine/server/schema.py
@@ -33,7 +33,7 @@ def get_schema():
 
     schema_generator = DynamicSchemaGenerator(schema_store)
 
-    return schema_generator.create_schema_dynamically()
+    return schema_generator.create_schema_dynamically(ModellerQuery, GraphSchema)
 
     # edge_schema_generator = DynamicSchemaGenerator(edges_schema_data_json, "edge", schema_store)
     #