diff --git a/building.rdf b/building.rdf
index 0864e6557..feee5666a 100644
--- a/building.rdf
+++ b/building.rdf
@@ -34,10 +34,10 @@
         <rdfs:seeAlso rdf:resource="https://w3id.org/rec/"/>
         <owl:versionInfo rdf:datatype="http://www.w3.org/2001/XMLSchema#string">3.1</owl:versionInfo>
     </owl:Ontology>
+    
 
 
-
-    <!--
+    <!-- 
     ///////////////////////////////////////////////////////////////////////////////////////
     //
     // Object Properties
@@ -45,7 +45,7 @@
     ///////////////////////////////////////////////////////////////////////////////////////
      -->
 
-
+    
 
 
     <!-- https://w3id.org/rec/building/roomType -->
@@ -55,10 +55,10 @@
         <rdfs:range rdf:resource="https://w3id.org/rec/building/RoomType"/>
         <rdfs:label xml:lang="en">room type</rdfs:label>
     </owl:ObjectProperty>
+    
 
 
-
-    <!--
+    <!-- 
     ///////////////////////////////////////////////////////////////////////////////////////
     //
     // Classes
@@ -66,7 +66,7 @@
     ///////////////////////////////////////////////////////////////////////////////////////
      -->
 
-
+    
 
 
     <!-- https://w3id.org/rec/building/Atrium -->
@@ -74,7 +74,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Atrium">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Auditorium -->
@@ -82,7 +82,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Auditorium">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/BackOffice -->
@@ -90,7 +90,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/BackOffice">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Balcony -->
@@ -99,7 +99,7 @@
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/BuildingComponent"/>
         <rdfs:label xml:lang="en">Balcony</rdfs:label>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/BarRoom -->
@@ -107,7 +107,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/BarRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/FoodHandlingRoom"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Bathroom -->
@@ -115,7 +115,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Bathroom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Bedroom -->
@@ -123,7 +123,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Bedroom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/BicycleGarage -->
@@ -131,7 +131,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/BicycleGarage">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/Garage"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Cabinet -->
@@ -139,7 +139,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Cabinet">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/UtilitiesRoom"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Cinema -->
@@ -147,7 +147,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Cinema">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Classroom -->
@@ -155,7 +155,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Classroom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/EducationalRoom"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/CleaningRoom -->
@@ -163,7 +163,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/CleaningRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ClimateControlRoom -->
@@ -171,7 +171,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/ClimateControlRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/UtilitiesRoom"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/CloakRoom -->
@@ -179,7 +179,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/CloakRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/CoffeeRoom -->
@@ -187,7 +187,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/CoffeeRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/FoodHandlingRoom"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ConferenceRoom -->
@@ -195,7 +195,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/ConferenceRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ConversationRoom -->
@@ -203,7 +203,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/ConversationRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/CookingRoom -->
@@ -211,7 +211,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/CookingRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/FoodHandlingRoom"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/CopyingRoom -->
@@ -219,7 +219,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/CopyingRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/DataServerRoom -->
@@ -227,7 +227,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/DataServerRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/UtilitiesRoom"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/DiningRoom -->
@@ -235,7 +235,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/DiningRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/FoodHandlingRoom"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/DisabledToilet -->
@@ -243,7 +243,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/DisabledToilet">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/PersonalHygiene"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/DishingRoom -->
@@ -251,7 +251,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/DishingRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/FoodHandlingRoom"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/DressingRoom -->
@@ -259,7 +259,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/DressingRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/EducationalRoom -->
@@ -267,7 +267,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/EducationalRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ElectricityRoom -->
@@ -275,7 +275,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/ElectricityRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/UtilitiesRoom"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ElevatorRoom -->
@@ -283,7 +283,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/ElevatorRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ElevatorShaft -->
@@ -291,7 +291,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/ElevatorShaft">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Entrance -->
@@ -299,7 +299,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Entrance">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ExerciseRoom -->
@@ -307,7 +307,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/ExerciseRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ExhibitionRoom -->
@@ -315,7 +315,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/ExhibitionRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Facade -->
@@ -324,7 +324,7 @@
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/BuildingComponent"/>
         <rdfs:label xml:lang="en">Facade</rdfs:label>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/FittingRoom -->
@@ -332,7 +332,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/FittingRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/RetailRoom"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Floor -->
@@ -341,7 +341,7 @@
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/BuildingComponent"/>
         <rdfs:label xml:lang="en">Floor</rdfs:label>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/FoodHandlingRoom -->
@@ -349,7 +349,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/FoodHandlingRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Garage -->
@@ -357,7 +357,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Garage">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/GroupRoom -->
@@ -365,7 +365,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/GroupRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/EducationalRoom"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Hallway -->
@@ -373,7 +373,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Hallway">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Laboratory -->
@@ -381,7 +381,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Laboratory">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/LaboratoryDry -->
@@ -389,7 +389,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/LaboratoryDry">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/Laboratory"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/LaboratoryWet -->
@@ -397,7 +397,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/LaboratoryWet">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/Laboratory"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/LaundryRoom -->
@@ -405,7 +405,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/LaundryRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Library -->
@@ -413,7 +413,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Library">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/LivingRoom -->
@@ -421,7 +421,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/LivingRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/MainEntrance -->
@@ -429,7 +429,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/MainEntrance">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/Entrance"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Office -->
@@ -437,7 +437,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Office">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/OfficeLandscape -->
@@ -445,7 +445,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/OfficeLandscape">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/Office"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/OfficeRoom -->
@@ -453,7 +453,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/OfficeRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/Office"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ParkingSlotCold -->
@@ -461,7 +461,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/ParkingSlotCold">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/Garage"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ParkingSlotWarm -->
@@ -469,7 +469,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/ParkingSlotWarm">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/Garage"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Pentry -->
@@ -477,7 +477,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Pentry">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/FoodHandlingRoom"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/PersonalHygiene -->
@@ -485,7 +485,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/PersonalHygiene">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/PhoneBooth -->
@@ -493,7 +493,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/PhoneBooth">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/Office"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Reception -->
@@ -501,7 +501,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Reception">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/RecordingRoom -->
@@ -509,7 +509,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/RecordingRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/RecreationalRoom -->
@@ -517,7 +517,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/RecreationalRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/RestingRoom -->
@@ -525,7 +525,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/RestingRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/RetailRoom -->
@@ -533,7 +533,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/RetailRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/RoofInner -->
@@ -542,7 +542,7 @@
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/BuildingComponent"/>
         <rdfs:label xml:lang="en">Roof, inner</rdfs:label>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/RoofOuter -->
@@ -551,7 +551,7 @@
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/BuildingComponent"/>
         <rdfs:label xml:lang="en">Roof, outer</rdfs:label>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/RoomType -->
@@ -559,7 +559,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/RoomType">
         <rdfs:label xml:lang="en">Room type</rdfs:label>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Sauna -->
@@ -567,7 +567,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Sauna">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/PersonalHygiene"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ServiceEntrance -->
@@ -575,7 +575,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/ServiceEntrance">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/Entrance"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ServiceShaft -->
@@ -583,7 +583,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/ServiceShaft">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Shelter -->
@@ -591,7 +591,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Shelter">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ShelterGasLock -->
@@ -599,7 +599,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/ShelterGasLock">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/Shelter"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ShelterRoom -->
@@ -607,7 +607,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/ShelterRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/Shelter"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ShowerRoom -->
@@ -615,7 +615,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/ShowerRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/PersonalHygiene"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Slab -->
@@ -624,7 +624,7 @@
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/BuildingComponent"/>
         <rdfs:label xml:lang="en">Slab</rdfs:label>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/SmallStudyRoom -->
@@ -632,7 +632,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/SmallStudyRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/EducationalRoom"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/StaffRoom -->
@@ -640,7 +640,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/StaffRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Stairwell -->
@@ -648,7 +648,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Stairwell">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Storage -->
@@ -656,7 +656,17 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Storage">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
+    
+
+
+    <!-- https://w3id.org/rec/building/Storey -->
 
+    <owl:Class rdf:about="https://w3id.org/rec/building/Storey">
+        <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/BuildingComponent"/>
+        <rdfs:comment xml:lang="en">The level of storey, a.k.a. floorplan</rdfs:comment>
+        <rdfs:label xml:lang="en">Storey</rdfs:label>
+    </owl:Class>
+    
 
 
     <!-- https://w3id.org/rec/building/StoreyLevel -->
@@ -665,8 +675,10 @@
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/BuildingComponent"/>
         <rdfs:comment xml:lang="en">The level of storey, a.k.a. floorplan</rdfs:comment>
         <rdfs:label xml:lang="en">Storey level</rdfs:label>
+        <owl:deprecated rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</owl:deprecated>
+        <owl:versionInfo xml:lang="en">Deprecated in favour of :Storey</owl:versionInfo>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/TelecommunicationRoom -->
@@ -674,7 +686,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/TelecommunicationRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/UtilitiesRoom"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Terrace -->
@@ -683,7 +695,7 @@
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/BuildingComponent"/>
         <rdfs:label xml:lang="en">Terrace</rdfs:label>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Theater -->
@@ -691,7 +703,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Theater">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Toilet -->
@@ -699,7 +711,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Toilet">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/PersonalHygiene"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/TreatmentRoom -->
@@ -707,7 +719,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/TreatmentRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/TreatmentWaitingRoom -->
@@ -715,7 +727,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/TreatmentWaitingRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/TreatmentRoom"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/UtilitiesRoom -->
@@ -723,7 +735,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/UtilitiesRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/VirtualBuilding -->
@@ -733,7 +745,7 @@
         <rdfs:comment xml:lang="en">A non-physical Building. Belongs to a RealEstate.</rdfs:comment>
         <rdfs:label xml:lang="en">Virtual building</rdfs:label>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/VirtualBuildingComponent -->
@@ -743,7 +755,7 @@
         <rdfs:comment xml:lang="en">A non-physical component. Belongs to a Building . One Building may have zero, one, or many Virtual components. E.g a temperature value from an external service for the area of a building.</rdfs:comment>
         <rdfs:label xml:lang="en">Virtual building component</rdfs:label>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Wall -->
@@ -752,7 +764,7 @@
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/BuildingComponent"/>
         <rdfs:label xml:lang="en">Wall</rdfs:label>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/WallInner -->
@@ -761,7 +773,7 @@
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/building/Wall"/>
         <rdfs:label xml:lang="en">Inner wall</rdfs:label>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/WasteManagementRoom -->
@@ -769,7 +781,7 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/WasteManagementRoom">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Workshop -->
@@ -777,16 +789,16 @@
     <owl:Class rdf:about="https://w3id.org/rec/building/Workshop">
         <rdfs:subClassOf rdf:resource="https://w3id.org/rec/core/Room"/>
     </owl:Class>
-
+    
 
 
     <!-- https://w3id.org/rec/core/Room -->
 
     <owl:Class rdf:about="https://w3id.org/rec/core/Room"/>
+    
 
 
-
-    <!--
+    <!-- 
     ///////////////////////////////////////////////////////////////////////////////////////
     //
     // Individuals
@@ -794,7 +806,7 @@
     ///////////////////////////////////////////////////////////////////////////////////////
      -->
 
-
+    
 
 
     <!-- https://w3id.org/rec/building/Atrium -->
@@ -802,7 +814,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Atrium">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Auditorium -->
@@ -810,7 +822,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Auditorium">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/BackOffice -->
@@ -818,7 +830,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/BackOffice">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/BarRoom -->
@@ -826,7 +838,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/BarRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Bathroom -->
@@ -834,7 +846,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Bathroom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Bedroom -->
@@ -842,7 +854,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Bedroom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/BicycleGarage -->
@@ -850,7 +862,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/BicycleGarage">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Cabinet -->
@@ -858,7 +870,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Cabinet">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Cinema -->
@@ -866,7 +878,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Cinema">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Classroom -->
@@ -874,7 +886,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Classroom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/CleaningRoom -->
@@ -882,7 +894,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/CleaningRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ClimateControlRoom -->
@@ -890,7 +902,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/ClimateControlRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/CloakRoom -->
@@ -898,7 +910,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/CloakRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/CoffeeRoom -->
@@ -906,7 +918,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/CoffeeRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ConferenceRoom -->
@@ -914,7 +926,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/ConferenceRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ConversationRoom -->
@@ -922,7 +934,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/ConversationRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/CookingRoom -->
@@ -930,7 +942,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/CookingRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/CopyingRoom -->
@@ -938,7 +950,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/CopyingRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/DataServerRoom -->
@@ -946,7 +958,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/DataServerRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/DiningRoom -->
@@ -954,7 +966,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/DiningRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/DisabledToilet -->
@@ -962,7 +974,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/DisabledToilet">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/DishingRoom -->
@@ -970,7 +982,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/DishingRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/DressingRoom -->
@@ -978,7 +990,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/DressingRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/EducationalRoom -->
@@ -986,7 +998,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/EducationalRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ElectricityRoom -->
@@ -994,7 +1006,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/ElectricityRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ElevatorRoom -->
@@ -1002,7 +1014,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/ElevatorRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ElevatorShaft -->
@@ -1010,7 +1022,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/ElevatorShaft">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Entrance -->
@@ -1018,7 +1030,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Entrance">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ExerciseRoom -->
@@ -1026,7 +1038,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/ExerciseRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ExhibitionRoom -->
@@ -1034,7 +1046,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/ExhibitionRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/FittingRoom -->
@@ -1042,7 +1054,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/FittingRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/FoodHandlingRoom -->
@@ -1050,7 +1062,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/FoodHandlingRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Garage -->
@@ -1058,7 +1070,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Garage">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/GroupRoom -->
@@ -1066,7 +1078,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/GroupRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Hallway -->
@@ -1074,7 +1086,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Hallway">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Laboratory -->
@@ -1082,7 +1094,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Laboratory">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/LaboratoryDry -->
@@ -1090,7 +1102,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/LaboratoryDry">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/LaboratoryWet -->
@@ -1098,7 +1110,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/LaboratoryWet">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/LaundryRoom -->
@@ -1106,7 +1118,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/LaundryRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Library -->
@@ -1114,7 +1126,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Library">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/LivingRoom -->
@@ -1122,7 +1134,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/LivingRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/MainEntrance -->
@@ -1130,7 +1142,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/MainEntrance">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Office -->
@@ -1138,7 +1150,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Office">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/OfficeLandscape -->
@@ -1146,7 +1158,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/OfficeLandscape">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/OfficeRoom -->
@@ -1154,7 +1166,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/OfficeRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ParkingSlotCold -->
@@ -1162,7 +1174,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/ParkingSlotCold">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ParkingSlotWarm -->
@@ -1170,7 +1182,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/ParkingSlotWarm">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Pentry -->
@@ -1178,7 +1190,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Pentry">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/PersonalHygiene -->
@@ -1186,7 +1198,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/PersonalHygiene">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/PhoneBooth -->
@@ -1194,7 +1206,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/PhoneBooth">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Reception -->
@@ -1202,7 +1214,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Reception">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/RecordingRoom -->
@@ -1210,7 +1222,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/RecordingRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/RecreationalRoom -->
@@ -1218,7 +1230,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/RecreationalRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/RestingRoom -->
@@ -1226,7 +1238,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/RestingRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/RetailRoom -->
@@ -1234,7 +1246,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/RetailRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Sauna -->
@@ -1242,7 +1254,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Sauna">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ServiceEntrance -->
@@ -1250,7 +1262,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/ServiceEntrance">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ServiceShaft -->
@@ -1258,7 +1270,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/ServiceShaft">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Shelter -->
@@ -1266,7 +1278,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Shelter">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ShelterGasLock -->
@@ -1274,7 +1286,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/ShelterGasLock">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ShelterRoom -->
@@ -1282,7 +1294,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/ShelterRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/ShowerRoom -->
@@ -1290,7 +1302,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/ShowerRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/SmallStudyRoom -->
@@ -1298,7 +1310,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/SmallStudyRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/StaffRoom -->
@@ -1306,7 +1318,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/StaffRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Stairwell -->
@@ -1314,7 +1326,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Stairwell">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Storage -->
@@ -1322,7 +1334,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Storage">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/TelecommunicationRoom -->
@@ -1330,7 +1342,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/TelecommunicationRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Theater -->
@@ -1338,7 +1350,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Theater">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Toilet -->
@@ -1346,7 +1358,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Toilet">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/TreatmentRoom -->
@@ -1354,7 +1366,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/TreatmentRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/TreatmentWaitingRoom -->
@@ -1362,7 +1374,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/TreatmentWaitingRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/UtilitiesRoom -->
@@ -1370,7 +1382,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/UtilitiesRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/WasteManagementRoom -->
@@ -1378,7 +1390,7 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/WasteManagementRoom">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
-
+    
 
 
     <!-- https://w3id.org/rec/building/Workshop -->
@@ -1386,10 +1398,10 @@
     <owl:NamedIndividual rdf:about="https://w3id.org/rec/building/Workshop">
         <rdf:type rdf:resource="https://w3id.org/rec/building/RoomType"/>
     </owl:NamedIndividual>
+    
 
 
-
-    <!--
+    <!-- 
     ///////////////////////////////////////////////////////////////////////////////////////
     //
     // Annotations
@@ -1520,8 +1532,8 @@
         <rdfs:label xml:lang="en">ExhibitionRoom</rdfs:label>
     </rdf:Description>
     <rdf:Description rdf:about="https://w3id.org/rec/building/FittingRoom">
-        <rdfs:label xml:lang="en">FittingRoom</rdfs:label>
         <owl:deprecated rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</owl:deprecated>
+        <rdfs:label xml:lang="en">FittingRoom</rdfs:label>
     </rdf:Description>
     <rdf:Description rdf:about="https://w3id.org/rec/building/FoodHandlingRoom">
         <owl:deprecated rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</owl:deprecated>
@@ -1635,8 +1647,8 @@
         <rdfs:label xml:lang="en">ServiceShaft</rdfs:label>
     </rdf:Description>
     <rdf:Description rdf:about="https://w3id.org/rec/building/Shelter">
-        <rdfs:label xml:lang="en">Shelter</rdfs:label>
         <owl:deprecated rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</owl:deprecated>
+        <rdfs:label xml:lang="en">Shelter</rdfs:label>
     </rdf:Description>
     <rdf:Description rdf:about="https://w3id.org/rec/building/ShelterGasLock">
         <owl:deprecated rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</owl:deprecated>
@@ -1706,3 +1718,4 @@
 
 
 <!-- Generated by the OWL API (version 4.5.9.2019-02-01T07:24:44Z) https://github.com/owlcs/owlapi -->
+