diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3
index 3ff50cfd..eb22e5f3 100644
--- a/rdf/display/everytime/PropertyConfig.n3
+++ b/rdf/display/everytime/PropertyConfig.n3
@@ -986,20 +986,6 @@ local:equipmentInFacilityConfig a :ObjectPropertyDisplayConfig ;
     vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGrouplocation> .
 
-local:hasRoomContext a :ConfigContext ;
-    :hasConfiguration local:hasRoomConfig ;
-    :configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ;
-    :qualifiedByDomain      vivo:Building ;
-    :qualifiedBy      vivo:Room .
-
-local:hasRoomConfig a :ObjectPropertyDisplayConfig ;
-    :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
-    :displayName "rooms" ;
-    vitro:displayRankAnnot 2;
-    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
-    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
-    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGrouplocation> .
-
 local:bldgGeographicallyContainsContext a :ConfigContext ;
     :hasConfiguration local:bldgGeographicallyContainsConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ;
diff --git a/rdf/tbox/filegraph/classes-additional.owl b/rdf/tbox/filegraph/classes-additional.owl
index aa3a59b2..c6e0c58a 100644
--- a/rdf/tbox/filegraph/classes-additional.owl
+++ b/rdf/tbox/filegraph/classes-additional.owl
@@ -315,6 +315,8 @@
         </rdfs:subClassOf>
     </owl:Class>
     
+    <!-- http://vivoweb.org/ontology/core#GeographicLocation -->
+
     <owl:Class rdf:about="http://vivoweb.org/ontology/core#GeographicLocation">
         <rdfs:subClassOf>
             <owl:Restriction>
@@ -534,6 +536,50 @@
     </owl:Class>
     
 
+    <!-- http://vivoweb.org/ontology/core#Facility -->
+
+    <owl:Class rdf:about="http://vivoweb.org/ontology/core#Facility">
+        <rdfs:subClassOf>
+            <owl:Restriction>
+                <owl:onProperty rdf:resource="http://purl.obolibrary.org/obo/BFO_0000050"/>
+                <owl:allValuesFrom rdf:resource="http://purl.obolibrary.org/obo/BFO_0000029"/>
+            </owl:Restriction>
+        </rdfs:subClassOf>
+        <rdfs:subClassOf>
+            <owl:Restriction>
+                <owl:onProperty rdf:resource="http://purl.obolibrary.org/obo/BFO_0000051"/>
+                <owl:allValuesFrom rdf:resource="http://vivoweb.org/ontology/core#Facility"/>
+            </owl:Restriction>
+        </rdfs:subClassOf>
+    </owl:Class>
+
+    <!-- http://vivoweb.org/ontology/core#Building -->
+
+    <owl:Class rdf:about="http://vivoweb.org/ontology/core#Building">
+        <rdfs:subClassOf>
+            <owl:Restriction>
+                <owl:onProperty rdf:resource="http://purl.obolibrary.org/obo/BFO_0000050"/>
+                <owl:allValuesFrom rdf:resource="http://vivoweb.org/ontology/core#Facility"/>
+            </owl:Restriction>
+        </rdfs:subClassOf>
+        <rdfs:subClassOf>
+            <owl:Restriction>
+                <owl:onProperty rdf:resource="http://purl.obolibrary.org/obo/BFO_0000051"/>
+                <owl:allValuesFrom rdf:resource="http://vivoweb.org/ontology/core#Room"/>
+            </owl:Restriction>
+        </rdfs:subClassOf>
+    </owl:Class>
+
+    <!-- http://vivoweb.org/ontology/core#Room -->
+
+    <owl:Class rdf:about="http://vivoweb.org/ontology/core#Room">
+        <rdfs:subClassOf>
+            <owl:Restriction>
+                <owl:onProperty rdf:resource="http://purl.obolibrary.org/obo/BFO_0000050"/>
+                <owl:allValuesFrom rdf:resource="http://vivoweb.org/ontology/core#Facility"/>
+            </owl:Restriction>
+        </rdfs:subClassOf>
+    </owl:Class>
 
     <!-- http://purl.org/spar/c4o/BibliographicInformationSource -->