diff --git a/src/blenderbim/blenderbim/bim/module/brick/prop.py b/src/blenderbim/blenderbim/bim/module/brick/prop.py
index 014ef0dffc..ae1b4d8fd8 100644
--- a/src/blenderbim/blenderbim/bim/module/brick/prop.py
+++ b/src/blenderbim/blenderbim/bim/module/brick/prop.py
@@ -52,11 +52,7 @@ def get_brick_entity_classes(self, context):
 
 
 def get_brick_roots(self, context):
-    return [("System", "System", ""),
-            ("Location", "Location", ""),
-            ("Equipment", "Equipment", ""),
-            ("Point", "Point", "")
-        ]
+    return BrickStore.root_classes
             
 
 class Brick(PropertyGroup):
diff --git a/src/blenderbim/blenderbim/tool/brick.py b/src/blenderbim/blenderbim/tool/brick.py
index 60d5c779d1..6723ba997a 100644
--- a/src/blenderbim/blenderbim/tool/brick.py
+++ b/src/blenderbim/blenderbim/tool/brick.py
@@ -345,6 +345,7 @@ class BrickStore:
     current_changesets = 0
     history_size = 64
     namespaces = []
+    root_classes = [("Equipment", "Equipment", ""), ("Location", "Location", ""), ("System", "System", ""), ("Point", "Point", "")]
     entity_classes = {}
 
     @staticmethod
@@ -374,8 +375,8 @@ class BrickStore:
 
     @classmethod
     def load_entity_classes(cls):
-        root_classes = ["System", "Location", "Equipment", "Point"]
-        for root_class in root_classes:
+        
+        for root_class, __, __ in BrickStore.root_classes:
             query = BrickStore.graph.query(
                 """
                 PREFIX brick: <https://brickschema.org/schema/Brick#>