diff --git a/_sources/examples/ibal.md b/_sources/examples/ibal.md
index 8d1e6a94..970f10f2 100644
--- a/_sources/examples/ibal.md
+++ b/_sources/examples/ibal.md
@@ -13,6 +13,8 @@ The schematics of the air and hydronic systems can be found [here](../_static/sc
 | Description | Query URL |
 |-------------|-----------|
 | Zone/room temperature sensors | [Query Link](https://query.open223.info/?query=PREFIX+s223%3A+%3Chttp%3A%2F%2Fdata.ashrae.org%2Fstandard223%23%3E+PREFIX+unit%3A+%3Chttp%3A%2F%2Fqudt.org%2Fvocab%2Funit%2F%3E+PREFIX+rdfs%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2000%2F01%2Frdf-schema%23%3E+PREFIX+rdf%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F1999%2F02%2F22-rdf-syntax-ns%23%3E+PREFIX+quantitykind%3A+%3Chttp%3A%2F%2Fqudt.org%2Fvocab%2Fquantitykind%2F%3E+PREFIX+qudt%3A+%3Chttp%3A%2F%2Fqudt.org%2Fschema%2Fqudt%2F%3E+PREFIX+sh%3A+%3Chttp%3A%2F%2Fwww.w3.org%2Fns%2Fshacl%23%3E+PREFIX+owl%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2002%2F07%2Fowl%23%3E+SELECT+%3Flocation+%3Fsensor+WHERE+%7B+++++%3Fsensor+rdf%3Atype%2Frdfs%3AsubClassOf%2A+s223%3ASensor+.+++++%3Fsensor+s223%3Aobserves+%3Fproperty+.+++++%3Fproperty+qudt%3AhasQuantityKind+quantitykind%3ATemperature+.+++++%3Fsensor+s223%3AhasObservationLocation+%3Flocation+%7D+&url=https://models.open223.info/ibal.ttl) |
+| Sensors in Connections | [Query Link](https://query.open223.info/?query=PREFIX+s223%3A+%3Chttp%3A%2F%2Fdata.ashrae.org%2Fstandard223%23%3E+PREFIX+unit%3A+%3Chttp%3A%2F%2Fqudt.org%2Fvocab%2Funit%2F%3E+PREFIX+rdfs%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2000%2F01%2Frdf-schema%23%3E+PREFIX+rdf%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F1999%2F02%2F22-rdf-syntax-ns%23%3E+PREFIX+quantitykind%3A+%3Chttp%3A%2F%2Fqudt.org%2Fvocab%2Fquantitykind%2F%3E+PREFIX+qudt%3A+%3Chttp%3A%2F%2Fqudt.org%2Fschema%2Fqudt%2F%3E+PREFIX+sh%3A+%3Chttp%3A%2F%2Fwww.w3.org%2Fns%2Fshacl%23%3E+PREFIX+owl%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2002%2F07%2Fowl%23%3E+SELECT+%3Fsegment+%3Fchannel+%3Fid+WHERE+%7B+++++%3Fsegment+a+s223%3AConnection+.+++++%3Fchannel+a%2Frdfs%3AsubClassOf%2A+s223%3ASensor+.+++++%3Fchannel+s223%3Aobserves+%3Fid+.+%7D+&url=https://models.open223.info/ibal.ttl) |
+| Sensors in AHU 1 and what units they are measured in | [Query Link](https://query.open223.info/?query=PREFIX+s223%3A+%3Chttp%3A%2F%2Fdata.ashrae.org%2Fstandard223%23%3E+PREFIX+unit%3A+%3Chttp%3A%2F%2Fqudt.org%2Fvocab%2Funit%2F%3E+PREFIX+rdfs%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2000%2F01%2Frdf-schema%23%3E+PREFIX+rdf%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F1999%2F02%2F22-rdf-syntax-ns%23%3E+PREFIX+quantitykind%3A+%3Chttp%3A%2F%2Fqudt.org%2Fvocab%2Fquantitykind%2F%3E+PREFIX+qudt%3A+%3Chttp%3A%2F%2Fqudt.org%2Fschema%2Fqudt%2F%3E+PREFIX+sh%3A+%3Chttp%3A%2F%2Fwww.w3.org%2Fns%2Fshacl%23%3E+PREFIX+owl%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2002%2F07%2Fowl%23%3E+SELECT+%3Fchannel+%3Fid+%3Funit+WHERE+%7B+++++BIND%28IBAL%3AAHU_1+as+%3Fahu%29+%7B+++++%7D+++++UNION+%7B+++++++++%3Fahu+s223%3Acontains+%3Fequipment+.+++++++++%3Fchannel+s223%3AhasObservationLocation+%3Fequipment+.+++++++++%3Fchannel+s223%3Aobserves+%3Fid+.+++++++++%3Fid+qudt%3AhasUnit+%3Funit+.+++++%7D+++++UNION+%7B+++++++++%3Fahu+s223%3Acontains+%3Fequipment+.+++++++++%3Fequipment+s223%3AconnectedThrough+%3Fconnnection+.+++++++++%3Fchannel+s223%3AhasObservationLocation+%3Fconnection+.+++++++++%3Fchannel+s223%3Aobserves+%3Fid+.+++++++++%3Fid+qudt%3AhasUnit+%3Fu+.+++++%7D+%7D+&url=https://models.open223.info/ibal.ttl) |
 
 ## Model Components
 | Parent Class | Class | Instances |
diff --git a/examples/ibal.html b/examples/ibal.html
index 988339d2..79af263e 100644
--- a/examples/ibal.html
+++ b/examples/ibal.html
@@ -409,6 +409,12 @@ <h2>Queries<a class="headerlink" href="#queries" title="Permalink to this headin
 <tr class="row-even"><td><p>Zone/room temperature sensors</p></td>
 <td><p><a class="reference external" href="https://query.open223.info/?query=PREFIX+s223%3A+%3Chttp%3A%2F%2Fdata.ashrae.org%2Fstandard223%23%3E+PREFIX+unit%3A+%3Chttp%3A%2F%2Fqudt.org%2Fvocab%2Funit%2F%3E+PREFIX+rdfs%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2000%2F01%2Frdf-schema%23%3E+PREFIX+rdf%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F1999%2F02%2F22-rdf-syntax-ns%23%3E+PREFIX+quantitykind%3A+%3Chttp%3A%2F%2Fqudt.org%2Fvocab%2Fquantitykind%2F%3E+PREFIX+qudt%3A+%3Chttp%3A%2F%2Fqudt.org%2Fschema%2Fqudt%2F%3E+PREFIX+sh%3A+%3Chttp%3A%2F%2Fwww.w3.org%2Fns%2Fshacl%23%3E+PREFIX+owl%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2002%2F07%2Fowl%23%3E+SELECT+%3Flocation+%3Fsensor+WHERE+%7B+++++%3Fsensor+rdf%3Atype%2Frdfs%3AsubClassOf%2A+s223%3ASensor+.+++++%3Fsensor+s223%3Aobserves+%3Fproperty+.+++++%3Fproperty+qudt%3AhasQuantityKind+quantitykind%3ATemperature+.+++++%3Fsensor+s223%3AhasObservationLocation+%3Flocation+%7D+&amp;url=https://models.open223.info/ibal.ttl">Query Link</a></p></td>
 </tr>
+<tr class="row-odd"><td><p>Sensors in Connections</p></td>
+<td><p><a class="reference external" href="https://query.open223.info/?query=PREFIX+s223%3A+%3Chttp%3A%2F%2Fdata.ashrae.org%2Fstandard223%23%3E+PREFIX+unit%3A+%3Chttp%3A%2F%2Fqudt.org%2Fvocab%2Funit%2F%3E+PREFIX+rdfs%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2000%2F01%2Frdf-schema%23%3E+PREFIX+rdf%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F1999%2F02%2F22-rdf-syntax-ns%23%3E+PREFIX+quantitykind%3A+%3Chttp%3A%2F%2Fqudt.org%2Fvocab%2Fquantitykind%2F%3E+PREFIX+qudt%3A+%3Chttp%3A%2F%2Fqudt.org%2Fschema%2Fqudt%2F%3E+PREFIX+sh%3A+%3Chttp%3A%2F%2Fwww.w3.org%2Fns%2Fshacl%23%3E+PREFIX+owl%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2002%2F07%2Fowl%23%3E+SELECT+%3Fsegment+%3Fchannel+%3Fid+WHERE+%7B+++++%3Fsegment+a+s223%3AConnection+.+++++%3Fchannel+a%2Frdfs%3AsubClassOf%2A+s223%3ASensor+.+++++%3Fchannel+s223%3Aobserves+%3Fid+.+%7D+&amp;url=https://models.open223.info/ibal.ttl">Query Link</a></p></td>
+</tr>
+<tr class="row-even"><td><p>Sensors in AHU 1 and what units they are measured in</p></td>
+<td><p><a class="reference external" href="https://query.open223.info/?query=PREFIX+s223%3A+%3Chttp%3A%2F%2Fdata.ashrae.org%2Fstandard223%23%3E+PREFIX+unit%3A+%3Chttp%3A%2F%2Fqudt.org%2Fvocab%2Funit%2F%3E+PREFIX+rdfs%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2000%2F01%2Frdf-schema%23%3E+PREFIX+rdf%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F1999%2F02%2F22-rdf-syntax-ns%23%3E+PREFIX+quantitykind%3A+%3Chttp%3A%2F%2Fqudt.org%2Fvocab%2Fquantitykind%2F%3E+PREFIX+qudt%3A+%3Chttp%3A%2F%2Fqudt.org%2Fschema%2Fqudt%2F%3E+PREFIX+sh%3A+%3Chttp%3A%2F%2Fwww.w3.org%2Fns%2Fshacl%23%3E+PREFIX+owl%3A+%3Chttp%3A%2F%2Fwww.w3.org%2F2002%2F07%2Fowl%23%3E+SELECT+%3Fchannel+%3Fid+%3Funit+WHERE+%7B+++++BIND%28IBAL%3AAHU_1+as+%3Fahu%29+%7B+++++%7D+++++UNION+%7B+++++++++%3Fahu+s223%3Acontains+%3Fequipment+.+++++++++%3Fchannel+s223%3AhasObservationLocation+%3Fequipment+.+++++++++%3Fchannel+s223%3Aobserves+%3Fid+.+++++++++%3Fid+qudt%3AhasUnit+%3Funit+.+++++%7D+++++UNION+%7B+++++++++%3Fahu+s223%3Acontains+%3Fequipment+.+++++++++%3Fequipment+s223%3AconnectedThrough+%3Fconnnection+.+++++++++%3Fchannel+s223%3AhasObservationLocation+%3Fconnection+.+++++++++%3Fchannel+s223%3Aobserves+%3Fid+.+++++++++%3Fid+qudt%3AhasUnit+%3Fu+.+++++%7D+%7D+&amp;url=https://models.open223.info/ibal.ttl">Query Link</a></p></td>
+</tr>
 </tbody>
 </table>
 </section>
diff --git a/guideline36-2021-4.1.jsonld b/guideline36-2021-4.1.jsonld
index a05ee359..9e667789 100644
--- a/guideline36-2021-4.1.jsonld
+++ b/guideline36-2021-4.1.jsonld
@@ -1,56 +1,29 @@
 [
     {
-        "@id": "urn:ex/in-connection",
+        "@id": "urn:ex/damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/duct-after-damper"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/damper",
-        "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/damper-in"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/damper-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/damper-command"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/damper-position"
+                "@id": "urn:ex/out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-cooling-only",
+        "@id": "urn:ex/",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAV"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/in"
-            },
-            {
-                "@id": "urn:ex/out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/damper"
-            }
+            "http://www.w3.org/2002/07/owl#Ontology"
         ]
     },
     {
@@ -70,13 +43,13 @@
         ]
     },
     {
-        "@id": "urn:ex/out",
+        "@id": "urn:ex/damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/out-connection"
+                "@id": "urn:ex/duct-before-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -84,86 +57,106 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/discharge-air-flow"
+                "@id": "urn:ex/in"
             }
         ]
     },
     {
-        "@id": "urn:ex/damper-command",
+        "@id": "urn:ex/in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/discharge-air-flow",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/damper-position",
+        "@id": "urn:ex/vav-cooling-only",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAV"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/in"
+            },
+            {
+                "@id": "urn:ex/out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/damper"
             }
         ]
     },
     {
-        "@id": "urn:ex/duct-before-damper",
+        "@id": "urn:ex/out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/out-connection"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/discharge-air-flow"
+            }
         ]
     },
     {
-        "@id": "urn:ex/damper-in",
+        "@id": "urn:ex/damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/duct-before-damper"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/in"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/out-connection",
+        "@id": "urn:ex/duct-before-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -184,53 +177,65 @@
         ]
     },
     {
-        "@id": "urn:ex/damper-out",
+        "@id": "urn:ex/damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-damper"
+                "@id": "urn:ex/damper-in"
+            },
+            {
+                "@id": "urn:ex/damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/damper-command"
+            },
+            {
+                "@id": "urn:ex/damper-position"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/damper-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/out"
+                "@id": "urn:ex/damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/discharge-air-flow",
+        "@id": "urn:ex/damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
-    {
-        "@id": "urn:ex/",
-        "@type": [
-            "http://www.w3.org/2002/07/owl#Ontology"
-        ]
-    },
     {
         "@id": "urn:ex/discharge-air-flow-sensor",
         "@type": [
@@ -248,18 +253,13 @@
         ]
     },
     {
-        "@id": "urn:ex/damper-actuator",
+        "@id": "urn:ex/out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/damper"
-            }
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     }
diff --git a/guideline36-2021-4.2.jsonld b/guideline36-2021-4.2.jsonld
index 02c71df3..2ebc67ba 100644
--- a/guideline36-2021-4.2.jsonld
+++ b/guideline36-2021-4.2.jsonld
@@ -1,58 +1,72 @@
 [
     {
-        "@id": "urn:ex/damper",
+        "@id": "urn:ex/hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/damper-in"
-            },
-            {
-                "@id": "urn:ex/damper-out"
+                "@id": "urn:ex/hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil",
+        "@id": "urn:ex/damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/reheat-coil-air-in"
-            },
+                "@id": "urn:ex/duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/reheat-coil-air-out"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/reheat-coil-air-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/reheat-coil-water-in"
-            },
+                "@id": "urn:ex/air-out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/reheat-coil-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/hot-water-in-connection",
+        "@id": "urn:ex/",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://www.w3.org/2002/07/owl#Ontology"
+        ]
+    },
+    {
+        "@id": "urn:ex/reheat-coil-water-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/pipe-hot-water-return-before-valve"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -61,13 +75,28 @@
         ]
     },
     {
-        "@id": "urn:ex/",
+        "@id": "urn:ex/damper-in",
         "@type": [
-            "http://www.w3.org/2002/07/owl#Ontology"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/air-in-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/air-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/duct-after-damper",
+        "@id": "urn:ex/air-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -100,7 +129,7 @@
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve-out",
+        "@id": "urn:ex/hot-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -113,188 +142,146 @@
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/hot-water-out"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-reheat",
+        "@id": "urn:ex/discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/air-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
                 "@id": "urn:ex/air-out"
-            },
-            {
-                "@id": "urn:ex/hot-water-in"
-            },
-            {
-                "@id": "urn:ex/hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/damper"
-            },
-            {
-                "@id": "urn:ex/reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/reheat-coil-valve"
+                "@id": "urn:ex/discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/hot-water-out",
+        "@id": "urn:ex/reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/hot-water-out-connection"
+                "@id": "urn:ex/hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/hot-water-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve",
+        "@id": "urn:ex/reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/reheat-coil-valve-out"
-            }
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "urn:ex/reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
                 "@id": "urn:ex/reheat-coil-valve-command"
-            },
-            {
-                "@id": "urn:ex/reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/air-in",
+        "@id": "urn:ex/damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/air-in-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve-command",
+        "@id": "urn:ex/discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/hot-water-out-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-water-in",
+        "@id": "urn:ex/damper",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/hot-water-in-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/hot-water-in"
+                "@id": "urn:ex/damper-command"
+            },
+            {
+                "@id": "urn:ex/damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/discharge-air-temp-sensor",
+        "@id": "urn:ex/air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/air-out"
+                "@id": "urn:ex/air-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/damper-position",
+        "@id": "urn:ex/pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
@@ -311,152 +298,177 @@
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve-position",
+        "@id": "urn:ex/vav-reheat",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/air-in"
+            },
+            {
+                "@id": "urn:ex/air-out"
+            },
+            {
+                "@id": "urn:ex/hot-water-in"
+            },
+            {
+                "@id": "urn:ex/hot-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/damper"
+            },
+            {
+                "@id": "urn:ex/reheat-coil"
+            },
+            {
+                "@id": "urn:ex/reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/discharge-air-temp",
+        "@id": "urn:ex/reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/hot-water-out-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/damper-out",
+        "@id": "urn:ex/reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-damper"
+                "@id": "urn:ex/reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/reheat-coil-valve-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/air-in-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/discharge-air-flow-sensor",
+        "@id": "urn:ex/reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/air-in"
+                "@id": "urn:ex/reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/air-out",
+        "@id": "urn:ex/duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/air-out-connection"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/discharge-air-temp"
-            }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-air-in",
+        "@id": "urn:ex/reheat-coil-valve-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-damper"
+                "@id": "urn:ex/pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve-actuator",
+        "@id": "urn:ex/damper-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/reheat-coil-valve"
+                "@id": "urn:ex/damper"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/reheat-coil-valve-command"
+                "@id": "urn:ex/damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/damper-command",
+        "@id": "urn:ex/reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
+                "@id": "urn:ex/duct-after-damper"
             }
         ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/reheat-coil-valve-position",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
                 "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
@@ -469,35 +481,31 @@
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-air-out",
+        "@id": "urn:ex/reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/air-out-connection"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/air-out"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/hot-water-in",
+        "@id": "urn:ex/hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/hot-water-in-connection"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -506,13 +514,13 @@
         ]
     },
     {
-        "@id": "urn:ex/damper-in",
+        "@id": "urn:ex/air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/air-in-connection"
+                "@id": "urn:ex/air-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -520,46 +528,38 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/air-in"
+                "@id": "urn:ex/discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve-in",
+        "@id": "urn:ex/damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/pipe-hot-water-return-before-valve"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/reheat-coil-water-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/pipe-hot-water-return-before-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -571,18 +571,18 @@
         ]
     },
     {
-        "@id": "urn:ex/damper-actuator",
+        "@id": "urn:ex/discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/damper"
+                "@id": "urn:ex/air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/damper-command"
+                "@id": "urn:ex/discharge-air-flow"
             }
         ]
     }
diff --git a/guideline36-2021-4.3-parallel-constant.jsonld b/guideline36-2021-4.3-parallel-constant.jsonld
index 9f7e82dd..fceb2325 100644
--- a/guideline36-2021-4.3-parallel-constant.jsonld
+++ b/guideline36-2021-4.3-parallel-constant.jsonld
@@ -1,31 +1,40 @@
 [
     {
-        "@id": "urn:ex/damper",
+        "@id": "urn:ex/fan-start-cmd",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/damper-in"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/damper-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/damper-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/damper-command"
-            },
+                "@id": "urn:ex/duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/supply-air-in-connection",
+        "@id": "urn:ex/reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/duct-after-reheat-coil"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -34,63 +43,74 @@
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil",
+        "@id": "urn:ex/",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://www.w3.org/2002/07/owl#Ontology"
+        ]
+    },
+    {
+        "@id": "urn:ex/fan",
+        "@type": [
+            "http://data.ashrae.org/standard223#Fan",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Fan"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/reheat-coil-in"
-            },
-            {
-                "@id": "urn:ex/reheat-coil-water-in"
+                "@id": "urn:ex/fan-in"
             },
             {
-                "@id": "urn:ex/reheat-coil-water-out"
+                "@id": "urn:ex/fan-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/fan-start-cmd"
+            },
+            {
+                "@id": "urn:ex/fan-start-status"
             }
         ]
     },
     {
-        "@id": "urn:ex/pipe-hot-water-supply",
+        "@id": "urn:ex/junction-in-2",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/duct-after-fan"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/duct-after-reheat-coil",
+        "@id": "urn:ex/reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/pipe-hot-water-supply"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-in",
+        "@id": "urn:ex/damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-before-reheat-coil"
+                "@id": "urn:ex/duct-before-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -100,21 +120,14 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/return-air-from-plenum-in"
+                "@id": "urn:ex/supply-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/",
-        "@type": [
-            "http://www.w3.org/2002/07/owl#Ontology"
-        ]
-    },
-    {
-        "@id": "urn:ex/duct-before-damper",
+        "@id": "urn:ex/return-air-from-plenum-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -123,33 +136,35 @@
         ]
     },
     {
-        "@id": "urn:ex/return-air-from-plenum-in-connection",
+        "@id": "urn:ex/junction-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/out-connection"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/duct-after-fan",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/out"
+            }
         ]
     },
     {
-        "@id": "urn:ex/duct-after-damper",
+        "@id": "urn:ex/fan-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/duct-after-reheat-coil"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -158,39 +173,44 @@
         ]
     },
     {
-        "@id": "urn:ex/supply-air-flow-sensor",
+        "@id": "urn:ex/supply-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/supply-air-in"
+                "@id": "urn:ex/supply-air-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
                 "@id": "urn:ex/supply-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve-out",
+        "@id": "urn:ex/discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/pipe-hot-water-return-after-valve"
+                "@id": "urn:ex/out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/pipe-hot-water-return-after-valve",
+        "@id": "urn:ex/pipe-hot-water-supply",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -202,110 +222,66 @@
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve",
+        "@id": "urn:ex/parallel-fan-powered-terminal-unit-constant-volume-fan",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#FanPoweredTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#FanPoweredTerminal"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/reheat-coil-valve-in"
+                "@id": "urn:ex/out"
             },
             {
-                "@id": "urn:ex/reheat-coil-valve-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/reheat-coil-valve-command"
+                "@id": "urn:ex/return-air-from-plenum-in"
             },
             {
-                "@id": "urn:ex/reheat-coil-valve-position"
+                "@id": "urn:ex/supply-air-in"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/junction-in-1",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/duct-after-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/damper"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/reheat-coil-valve-command",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+                "@id": "urn:ex/fan"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/junction"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/reheat-coil"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/supply-air-in",
+        "@id": "urn:ex/pipe-hot-water-return-after-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/supply-air-in-connection"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/supply-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/out",
+        "@id": "urn:ex/fan-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/out-connection"
+                "@id": "urn:ex/duct-after-fan"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/discharge-air-temp"
-            }
         ]
     },
     {
@@ -325,18 +301,18 @@
         ]
     },
     {
-        "@id": "urn:ex/discharge-air-temp-sensor",
+        "@id": "urn:ex/reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/out"
+                "@id": "urn:ex/reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/discharge-air-temp"
+                "@id": "urn:ex/reheat-coil-valve-command"
             }
         ]
     },
@@ -357,60 +333,31 @@
         ]
     },
     {
-        "@id": "urn:ex/out-connection",
+        "@id": "urn:ex/discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/parallel-fan-powered-terminal-unit-constant-volume-fan",
-        "@type": [
-            "http://data.ashrae.org/standard223#FanPoweredTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#FanPoweredTerminal"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/out"
-            },
-            {
-                "@id": "urn:ex/return-air-from-plenum-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/supply-air-in"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/damper"
-            },
-            {
-                "@id": "urn:ex/fan"
-            },
-            {
-                "@id": "urn:ex/junction"
-            },
-            {
-                "@id": "urn:ex/reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/fan-in",
+        "@id": "urn:ex/duct-before-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/duct-after-reheat-coil"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -419,134 +366,154 @@
         ]
     },
     {
-        "@id": "urn:ex/duct-before-reheat-coil",
+        "@id": "urn:ex/damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/damper-in"
+            },
+            {
+                "@id": "urn:ex/damper-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/damper-command"
+            },
+            {
+                "@id": "urn:ex/damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/return-air-from-plenum-in",
+        "@id": "urn:ex/supply-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/return-air-from-plenum-in-connection"
+                "@id": "urn:ex/supply-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/supply-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve-position",
+        "@id": "urn:ex/pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/discharge-air-temp",
+        "@id": "urn:ex/supply-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "http://data.ashrae.org/standard223#Role-Supply"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/fan-start-cmd",
+        "@id": "urn:ex/reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "urn:ex/pipe-hot-water-return-after-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/junction-out",
+        "@id": "urn:ex/return-air-from-plenum-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/out-connection"
+                "@id": "urn:ex/return-air-from-plenum-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/duct-before-reheat-coil",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/fan",
+        "@id": "urn:ex/reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Fan"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/fan-in"
+                "@id": "urn:ex/reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/fan-out"
+                "@id": "urn:ex/reheat-coil-valve-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/fan-start-cmd"
+                "@id": "urn:ex/reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/fan-start-status"
+                "@id": "urn:ex/reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/damper-out",
+        "@id": "urn:ex/duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/duct-after-damper"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -555,104 +522,100 @@
         ]
     },
     {
-        "@id": "urn:ex/junction-in-2",
+        "@id": "urn:ex/reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-fan"
+                "@id": "urn:ex/reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/reheat-coil-in"
+            },
+            {
+                "@id": "urn:ex/reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/fan-out",
+        "@id": "urn:ex/reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-fan"
+                "@id": "urn:ex/pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/supply-air-flow",
+        "@id": "urn:ex/damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Supply"
-            }
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve-actuator",
+        "@id": "urn:ex/out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/reheat-coil-valve"
-            }
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/damper-command",
+        "@id": "urn:ex/reheat-coil-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
+                "@id": "urn:ex/duct-before-reheat-coil"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/return-air-from-plenum-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-air-out",
+        "@id": "urn:ex/duct-after-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/duct-after-reheat-coil"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -661,23 +624,45 @@
         ]
     },
     {
-        "@id": "urn:ex/damper-in",
+        "@id": "urn:ex/junction-in-1",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-before-damper"
+                "@id": "urn:ex/duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/supply-air-in-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/reheat-coil-valve-position",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/supply-air-in"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
@@ -704,73 +689,88 @@
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve-in",
+        "@id": "urn:ex/reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/pipe-hot-water-return-before-valve"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/fan-start-status",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-water-out",
+        "@id": "urn:ex/out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/pipe-hot-water-supply"
+                "@id": "urn:ex/out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/damper-actuator",
+        "@id": "urn:ex/duct-after-fan",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/damper"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/fan-start-status",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/damper-command"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     }
diff --git a/guideline36-2021-4.3-parallel-variable.jsonld b/guideline36-2021-4.3-parallel-variable.jsonld
index f48d0768..454eb1e8 100644
--- a/guideline36-2021-4.3-parallel-variable.jsonld
+++ b/guideline36-2021-4.3-parallel-variable.jsonld
@@ -1,92 +1,91 @@
 [
     {
-        "@id": "urn:ex/damper",
+        "@id": "urn:ex/fan-start-cmd",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/damper-in"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/damper-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/damper-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/damper-command"
-            },
+                "@id": "urn:ex/duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/parallel-fan-powered-terminal-unit-variable-volume-fan",
+        "@id": "urn:ex/",
         "@type": [
-            "http://data.ashrae.org/standard223#FanPoweredTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#FanPoweredTerminal"
+            "http://www.w3.org/2002/07/owl#Ontology"
+        ]
+    },
+    {
+        "@id": "urn:ex/reheat-coil-air-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/out"
-            },
-            {
-                "@id": "urn:ex/return-air-from-plenum-in"
-            },
-            {
-                "@id": "urn:ex/supply-air-in"
+                "@id": "urn:ex/duct-after-reheat-coil"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/damper"
-            },
-            {
-                "@id": "urn:ex/fan"
-            },
-            {
-                "@id": "urn:ex/junction"
-            },
-            {
-                "@id": "urn:ex/reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil",
+        "@id": "urn:ex/fan",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#Fan",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#FanWithVFD"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/reheat-coil-air-out"
+                "@id": "urn:ex/fan-in"
             },
             {
-                "@id": "urn:ex/reheat-coil-in"
+                "@id": "urn:ex/fan-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/fan-speed-cmd"
             },
             {
-                "@id": "urn:ex/reheat-coil-water-in"
+                "@id": "urn:ex/fan-speed-status"
             },
             {
-                "@id": "urn:ex/reheat-coil-water-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
+                "@id": "urn:ex/fan-start-cmd"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/fan-start-status"
             }
         ]
     },
     {
-        "@id": "urn:ex/supply-air-in-connection",
+        "@id": "urn:ex/junction-in-2",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/duct-after-fan"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -95,37 +94,29 @@
         ]
     },
     {
-        "@id": "urn:ex/pipe-hot-water-supply",
+        "@id": "urn:ex/reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/pipe-hot-water-supply"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/duct-after-reheat-coil",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-in",
+        "@id": "urn:ex/damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-before-reheat-coil"
+                "@id": "urn:ex/duct-before-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -135,21 +126,14 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/return-air-from-plenum-in"
+                "@id": "urn:ex/supply-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/",
-        "@type": [
-            "http://www.w3.org/2002/07/owl#Ontology"
-        ]
-    },
-    {
-        "@id": "urn:ex/duct-before-damper",
+        "@id": "urn:ex/return-air-from-plenum-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -158,21 +142,35 @@
         ]
     },
     {
-        "@id": "urn:ex/return-air-from-plenum-in-connection",
+        "@id": "urn:ex/junction-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/out-connection"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/out"
+            }
         ]
     },
     {
-        "@id": "urn:ex/duct-after-fan",
+        "@id": "urn:ex/fan-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/duct-after-reheat-coil"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -181,42 +179,47 @@
         ]
     },
     {
-        "@id": "urn:ex/duct-after-damper",
+        "@id": "urn:ex/supply-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/supply-air-in-connection"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/supply-air-flow"
+            }
         ]
     },
     {
-        "@id": "urn:ex/supply-air-flow-sensor",
+        "@id": "urn:ex/discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/supply-air-in"
+                "@id": "urn:ex/out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/supply-air-flow"
+                "@id": "urn:ex/discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve-out",
+        "@id": "urn:ex/pipe-hot-water-supply",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/pipe-hot-water-return-after-valve"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -237,58 +240,57 @@
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve",
+        "@id": "urn:ex/fan-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/reheat-coil-valve-out"
+                "@id": "urn:ex/duct-after-fan"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/reheat-coil-valve-command"
-            },
-            {
-                "@id": "urn:ex/reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/junction-in-1",
+        "@id": "urn:ex/reheat-coil-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-damper"
+                "@id": "urn:ex/pipe-hot-water-return-after-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve-command",
+        "@id": "urn:ex/reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
+                "@id": "urn:ex/reheat-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/reheat-coil-valve-command"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/damper-position",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -302,102 +304,100 @@
         ]
     },
     {
-        "@id": "urn:ex/supply-air-in",
+        "@id": "urn:ex/discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/supply-air-in-connection"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/supply-air-flow"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/fan-speed-cmd",
+        "@id": "urn:ex/duct-before-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Speed"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/out",
+        "@id": "urn:ex/damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/out-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/discharge-air-temp"
+                "@id": "urn:ex/damper-command"
+            },
+            {
+                "@id": "urn:ex/damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-water-in",
+        "@id": "urn:ex/fan-speed-cmd",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/pipe-hot-water-return-after-valve"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Speed"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/discharge-air-temp-sensor",
+        "@id": "urn:ex/supply-air-flow-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/out"
+                "@id": "urn:ex/supply-air-in"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/discharge-air-temp"
+                "@id": "urn:ex/supply-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/damper-position",
+        "@id": "urn:ex/fan-speed-status",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -413,57 +413,51 @@
         ]
     },
     {
-        "@id": "urn:ex/out-connection",
+        "@id": "urn:ex/pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/fan-speed-status",
+        "@id": "urn:ex/supply-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Supply"
+            }
+        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/fan-in",
+        "@id": "urn:ex/reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-reheat-coil"
+                "@id": "urn:ex/pipe-hot-water-return-after-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/duct-before-reheat-coil",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
@@ -484,144 +478,119 @@
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve-position",
+        "@id": "urn:ex/duct-before-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/discharge-air-temp",
+        "@id": "urn:ex/reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/reheat-coil-valve-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/reheat-coil-valve-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/fan-start-cmd",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "urn:ex/reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/junction-out",
+        "@id": "urn:ex/duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/out-connection"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/out"
-            }
         ]
     },
     {
-        "@id": "urn:ex/fan",
+        "@id": "urn:ex/reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#FanWithVFD"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/fan-in"
+                "@id": "urn:ex/reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/fan-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/fan-speed-cmd"
+                "@id": "urn:ex/reheat-coil-in"
             },
             {
-                "@id": "urn:ex/fan-speed-status"
+                "@id": "urn:ex/reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/fan-start-cmd"
-            },
+                "@id": "urn:ex/reheat-coil-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/fan-start-status"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/damper-out",
+        "@id": "urn:ex/reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-damper"
+                "@id": "urn:ex/pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/junction-in-2",
+        "@id": "urn:ex/damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/duct-after-fan"
+                "@id": "urn:ex/damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/fan-out",
+        "@id": "urn:ex/out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/duct-after-fan"
-            }
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -630,72 +599,58 @@
         ]
     },
     {
-        "@id": "urn:ex/supply-air-flow",
+        "@id": "urn:ex/reheat-coil-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Supply"
+                "@id": "urn:ex/duct-before-reheat-coil"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/return-air-from-plenum-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve-actuator",
+        "@id": "urn:ex/duct-after-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/reheat-coil-valve"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/damper-command",
+        "@id": "urn:ex/junction-in-1",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/duct-after-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-air-out",
+        "@id": "urn:ex/supply-air-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/duct-after-reheat-coil"
-            }
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -704,23 +659,18 @@
         ]
     },
     {
-        "@id": "urn:ex/damper-in",
+        "@id": "urn:ex/reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/duct-before-damper"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/supply-air-in"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
@@ -747,73 +697,123 @@
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-valve-in",
+        "@id": "urn:ex/reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/pipe-hot-water-return-before-valve"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/fan-start-status",
+        "@id": "urn:ex/out",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "urn:ex/out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/reheat-coil-water-out",
+        "@id": "urn:ex/damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/pipe-hot-water-supply"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/duct-after-fan",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/damper-actuator",
+        "@id": "urn:ex/parallel-fan-powered-terminal-unit-variable-volume-fan",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#FanPoweredTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#FanPoweredTerminal"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/out"
+            },
+            {
+                "@id": "urn:ex/return-air-from-plenum-in"
+            },
+            {
+                "@id": "urn:ex/supply-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
             {
                 "@id": "urn:ex/damper"
+            },
+            {
+                "@id": "urn:ex/fan"
+            },
+            {
+                "@id": "urn:ex/junction"
+            },
+            {
+                "@id": "urn:ex/reheat-coil"
+            },
+            {
+                "@id": "urn:ex/reheat-coil-valve"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/fan-start-status",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/damper-command"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     }
diff --git a/guideline36-2021-4.4.jsonld b/guideline36-2021-4.4.jsonld
index 7924e05d..7ad9d838 100644
--- a/guideline36-2021-4.4.jsonld
+++ b/guideline36-2021-4.4.jsonld
@@ -1,55 +1,35 @@
 [
     {
-        "@id": "urn:ex/duct-before-hot-deck-damper",
+        "@id": "urn:ex/",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
+            "http://www.w3.org/2002/07/owl#Ontology"
         ]
     },
     {
-        "@id": "urn:ex/hot-deck-damper-out",
+        "@id": "urn:ex/hot-deck-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/duct-after-hot-deck-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/duct-before-cold-deck-damper",
+        "@id": "urn:ex/junction-in-2",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/duct-after-cold-deck-damper"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/",
-        "@type": [
-            "http://www.w3.org/2002/07/owl#Ontology"
-        ]
-    },
-    {
-        "@id": "urn:ex/duct-after-hot-deck-damper",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -58,47 +38,71 @@
         ]
     },
     {
-        "@id": "urn:ex/duct-after-cold-deck-damper",
+        "@id": "urn:ex/hot-deck-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/hot-deck-damper-in"
+            },
+            {
+                "@id": "urn:ex/hot-deck-damper-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/hot-deck-damper-command"
+            },
+            {
+                "@id": "urn:ex/hot-deck-damper-position"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+            },
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Supply"
             }
         ]
     },
     {
-        "@id": "urn:ex/cold-deck-damper-out",
+        "@id": "urn:ex/cold-deck-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/duct-after-cold-deck-damper"
+                "@id": "urn:ex/cold-deck-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/cold-deck-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/junction-in-1",
+        "@id": "urn:ex/junction-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-hot-deck-damper"
+                "@id": "urn:ex/out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/out"
+            }
         ]
     },
     {
@@ -118,13 +122,36 @@
         ]
     },
     {
-        "@id": "urn:ex/hot-deck-supply-air-flow",
+        "@id": "urn:ex/cold-deck-in-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/duct-after-hot-deck-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/cold-deck-supply-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
             },
             {
                 "@id": "http://data.ashrae.org/standard223#Role-Supply"
@@ -142,25 +169,31 @@
         ]
     },
     {
-        "@id": "urn:ex/out",
+        "@id": "urn:ex/cold-deck-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/out-connection"
+                "@id": "urn:ex/cold-deck-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/cold-deck-supply-air-flow"
+            }
         ]
     },
     {
-        "@id": "urn:ex/out-connection",
+        "@id": "urn:ex/duct-before-cold-deck-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -169,50 +202,60 @@
         ]
     },
     {
-        "@id": "urn:ex/hot-deck-supply-air-flow-sensor",
+        "@id": "urn:ex/cold-deck-supply-air-flow-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/hot-deck-in"
+                "@id": "urn:ex/cold-deck-in"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/hot-deck-supply-air-flow"
+                "@id": "urn:ex/cold-deck-supply-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/cold-deck-damper-command",
+        "@id": "urn:ex/cold-deck-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
+                "@id": "urn:ex/cold-deck-damper-in"
+            },
+            {
+                "@id": "urn:ex/cold-deck-damper-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/cold-deck-damper-command"
+            },
+            {
+                "@id": "urn:ex/cold-deck-damper-position"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+            },
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Supply"
             }
         ]
     },
     {
-        "@id": "urn:ex/hot-deck-in",
+        "@id": "urn:ex/cold-deck-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/hot-deck-in-connection"
+                "@id": "urn:ex/duct-before-cold-deck-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -220,20 +263,20 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/hot-deck-supply-air-flow"
+                "@id": "urn:ex/cold-deck-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/junction-out",
+        "@id": "urn:ex/hot-deck-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/out-connection"
+                "@id": "urn:ex/duct-before-hot-deck-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -243,7 +286,19 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/out"
+                "@id": "urn:ex/hot-deck-in"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/duct-before-hot-deck-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
@@ -264,55 +319,42 @@
         ]
     },
     {
-        "@id": "urn:ex/hot-deck-damper",
+        "@id": "urn:ex/dual-duct-terminal-unit-with-inlet-sensors",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#DualDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#DualDuctTerminalWithInletSensors"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/hot-deck-damper-in"
+                "@id": "urn:ex/cold-deck-in"
             },
             {
-                "@id": "urn:ex/hot-deck-damper-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/hot-deck-damper-command"
+                "@id": "urn:ex/hot-deck-in"
             },
             {
-                "@id": "urn:ex/hot-deck-damper-position"
+                "@id": "urn:ex/out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/cold-deck-damper"
             },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Supply"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/cold-deck-in-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/hot-deck-damper"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/junction"
             }
         ]
     },
     {
-        "@id": "urn:ex/junction-in-2",
+        "@id": "urn:ex/hot-deck-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-cold-deck-damper"
+                "@id": "urn:ex/duct-after-hot-deck-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -322,162 +364,151 @@
         ]
     },
     {
-        "@id": "urn:ex/cold-deck-supply-air-flow-sensor",
+        "@id": "urn:ex/out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/cold-deck-in"
-            }
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/cold-deck-supply-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/hot-deck-damper-command",
+        "@id": "urn:ex/hot-deck-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
+                "@id": "urn:ex/hot-deck-in-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/hot-deck-supply-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/hot-deck-damper-position",
+        "@id": "urn:ex/junction-in-1",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/duct-after-hot-deck-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/hot-deck-damper-in",
+        "@id": "urn:ex/junction",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-before-hot-deck-damper"
+                "@id": "urn:ex/junction-in-1"
+            },
+            {
+                "@id": "urn:ex/junction-in-2"
+            },
+            {
+                "@id": "urn:ex/junction-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/hot-deck-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/hot-deck-in-connection",
+        "@id": "urn:ex/hot-deck-supply-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/hot-deck-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/hot-deck-supply-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/cold-deck-damper-in",
+        "@id": "urn:ex/duct-after-cold-deck-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/duct-before-cold-deck-damper"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/cold-deck-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/cold-deck-in",
+        "@id": "urn:ex/hot-deck-supply-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/cold-deck-in-connection"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+            },
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Supply"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/cold-deck-supply-air-flow"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/cold-deck-damper-actuator",
+        "@id": "urn:ex/out",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/cold-deck-damper"
+                "@id": "urn:ex/out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/cold-deck-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/junction",
+        "@id": "urn:ex/cold-deck-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/junction-in-1"
-            },
-            {
-                "@id": "urn:ex/junction-in-2"
-            },
-            {
-                "@id": "urn:ex/junction-out"
+                "@id": "urn:ex/duct-after-cold-deck-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -487,86 +518,55 @@
         ]
     },
     {
-        "@id": "urn:ex/cold-deck-damper",
+        "@id": "urn:ex/cold-deck-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/cold-deck-damper-in"
-            },
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/cold-deck-damper-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/cold-deck-damper-command"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/cold-deck-damper-position"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Supply"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/dual-duct-terminal-unit-with-inlet-sensors",
+        "@id": "urn:ex/hot-deck-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#DualDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#DualDuctTerminalWithInletSensors"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/cold-deck-in"
-            },
-            {
-                "@id": "urn:ex/hot-deck-in"
-            },
-            {
-                "@id": "urn:ex/out"
-            }
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/cold-deck-damper"
-            },
-            {
-                "@id": "urn:ex/hot-deck-damper"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/junction"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/cold-deck-supply-air-flow",
+        "@id": "urn:ex/hot-deck-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
-            },
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Supply"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     }
diff --git a/guideline36-2021-4.5.jsonld b/guideline36-2021-4.5.jsonld
index 3390438e..8b9ddb58 100644
--- a/guideline36-2021-4.5.jsonld
+++ b/guideline36-2021-4.5.jsonld
@@ -1,37 +1,35 @@
 [
     {
-        "@id": "urn:ex/duct-before-hot-deck-damper",
+        "@id": "urn:ex/",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
+            "http://www.w3.org/2002/07/owl#Ontology"
         ]
     },
     {
-        "@id": "urn:ex/hot-deck-damper-out",
+        "@id": "urn:ex/hot-deck-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/duct-after-hot-deck-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/duct-before-cold-deck-damper",
+        "@id": "urn:ex/junction-in-2",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/duct-after-cold-deck-damper"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -40,85 +38,91 @@
         ]
     },
     {
-        "@id": "urn:ex/",
-        "@type": [
-            "http://www.w3.org/2002/07/owl#Ontology"
-        ]
-    },
-    {
-        "@id": "urn:ex/discharge-air-flow",
+        "@id": "urn:ex/hot-deck-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/hot-deck-damper-in"
+            },
+            {
+                "@id": "urn:ex/hot-deck-damper-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/hot-deck-damper-command"
+            },
+            {
+                "@id": "urn:ex/hot-deck-damper-position"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+            },
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Supply"
             }
         ]
     },
     {
-        "@id": "urn:ex/duct-after-hot-deck-damper",
+        "@id": "urn:ex/cold-deck-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/cold-deck-damper"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/duct-after-cold-deck-damper",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/cold-deck-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/cold-deck-damper-out",
+        "@id": "urn:ex/junction-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-cold-deck-damper"
+                "@id": "urn:ex/out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/out"
+            }
         ]
     },
     {
-        "@id": "urn:ex/junction-in-1",
+        "@id": "urn:ex/discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/duct-after-hot-deck-damper"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
@@ -139,30 +143,49 @@
         ]
     },
     {
-        "@id": "urn:ex/out",
+        "@id": "urn:ex/cold-deck-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/out-connection"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/duct-after-hot-deck-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/cold-deck-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/cold-deck-in-connection"
+            }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/out-connection",
+        "@id": "urn:ex/duct-before-cold-deck-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -171,90 +194,88 @@
         ]
     },
     {
-        "@id": "urn:ex/dual-duct-terminal-unit-with-discharge-sensor",
+        "@id": "urn:ex/cold-deck-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#DualDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#DualDuctTerminalWithDischargeSensor"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/cold-deck-in"
-            },
-            {
-                "@id": "urn:ex/hot-deck-in"
+                "@id": "urn:ex/cold-deck-damper-in"
             },
             {
-                "@id": "urn:ex/out"
+                "@id": "urn:ex/cold-deck-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/cold-deck-damper"
+                "@id": "urn:ex/cold-deck-damper-command"
             },
             {
-                "@id": "urn:ex/hot-deck-damper"
+                "@id": "urn:ex/cold-deck-damper-position"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
             },
             {
-                "@id": "urn:ex/junction"
+                "@id": "http://data.ashrae.org/standard223#Role-Supply"
             }
         ]
     },
     {
-        "@id": "urn:ex/cold-deck-damper-command",
+        "@id": "urn:ex/cold-deck-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
+                "@id": "urn:ex/duct-before-cold-deck-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/cold-deck-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/hot-deck-in",
+        "@id": "urn:ex/hot-deck-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/hot-deck-in-connection"
+                "@id": "urn:ex/duct-before-hot-deck-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/hot-deck-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/junction-out",
+        "@id": "urn:ex/duct-before-hot-deck-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/out-connection"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/out"
-            }
         ]
     },
     {
@@ -274,55 +295,42 @@
         ]
     },
     {
-        "@id": "urn:ex/hot-deck-damper",
+        "@id": "urn:ex/dual-duct-terminal-unit-with-discharge-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#DualDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#DualDuctTerminalWithDischargeSensor"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/hot-deck-damper-in"
+                "@id": "urn:ex/cold-deck-in"
             },
             {
-                "@id": "urn:ex/hot-deck-damper-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/hot-deck-damper-command"
+                "@id": "urn:ex/hot-deck-in"
             },
             {
-                "@id": "urn:ex/hot-deck-damper-position"
+                "@id": "urn:ex/out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/cold-deck-damper"
             },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Supply"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/cold-deck-in-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/hot-deck-damper"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/junction"
             }
         ]
     },
     {
-        "@id": "urn:ex/junction-in-2",
+        "@id": "urn:ex/hot-deck-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-cold-deck-damper"
+                "@id": "urn:ex/duct-after-hot-deck-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -332,83 +340,75 @@
         ]
     },
     {
-        "@id": "urn:ex/hot-deck-damper-command",
+        "@id": "urn:ex/out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/discharge-air-flow-sensor",
+        "@id": "urn:ex/hot-deck-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/out"
+                "@id": "urn:ex/hot-deck-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/hot-deck-damper-position",
+        "@id": "urn:ex/junction-in-1",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/duct-after-hot-deck-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/hot-deck-damper-in",
+        "@id": "urn:ex/junction",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-before-hot-deck-damper"
+                "@id": "urn:ex/junction-in-1"
+            },
+            {
+                "@id": "urn:ex/junction-in-2"
+            },
+            {
+                "@id": "urn:ex/junction-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/hot-deck-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/hot-deck-in-connection",
+        "@id": "urn:ex/duct-after-cold-deck-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -417,13 +417,13 @@
         ]
     },
     {
-        "@id": "urn:ex/cold-deck-damper-in",
+        "@id": "urn:ex/out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-before-cold-deck-damper"
+                "@id": "urn:ex/out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -431,20 +431,20 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/cold-deck-in"
+                "@id": "urn:ex/discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/cold-deck-in",
+        "@id": "urn:ex/cold-deck-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/cold-deck-in-connection"
+                "@id": "urn:ex/duct-after-cold-deck-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -454,36 +454,30 @@
         ]
     },
     {
-        "@id": "urn:ex/cold-deck-damper-actuator",
+        "@id": "urn:ex/cold-deck-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/cold-deck-damper"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/cold-deck-damper-command"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/junction",
+        "@id": "urn:ex/hot-deck-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/junction-in-1"
-            },
-            {
-                "@id": "urn:ex/junction-in-2"
-            },
-            {
-                "@id": "urn:ex/junction-out"
-            }
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -492,33 +486,39 @@
         ]
     },
     {
-        "@id": "urn:ex/cold-deck-damper",
+        "@id": "urn:ex/discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/cold-deck-damper-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/cold-deck-damper-out"
+                "@id": "urn:ex/out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/cold-deck-damper-command"
-            },
+                "@id": "urn:ex/discharge-air-flow"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/hot-deck-damper-command",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/cold-deck-damper-position"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Supply"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     }
diff --git a/guideline36-2021-4.6.jsonld b/guideline36-2021-4.6.jsonld
index 64541e79..eddcea14 100644
--- a/guideline36-2021-4.6.jsonld
+++ b/guideline36-2021-4.6.jsonld
@@ -1,24 +1,23 @@
 [
     {
-        "@id": "urn:ex/duct-after-htg-coil",
+        "@id": "urn:ex/sa-fan-start-status",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/ea-damper-in",
+        "@id": "urn:ex/outside-supply-junction-in-2",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-before-ea-damper"
+                "@id": "urn:ex/duct-after-minimum-oa-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -28,46 +27,60 @@
         ]
     },
     {
-        "@id": "urn:ex/return-exhaust-junction-out-1",
+        "@id": "urn:ex/ra-fan-speed-cmd",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/duct-before-ea-damper"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Speed"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/duct-before-minimum-oa-damper",
+        "@id": "urn:ex/ra-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/ra-fan"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/ra-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/htg-coil-water-out",
+        "@id": "urn:ex/ea-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/pipe-hot-water-supply"
+                "@id": "urn:ex/ea-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/ea-out"
             }
         ]
     },
@@ -88,13 +101,13 @@
         ]
     },
     {
-        "@id": "urn:ex/economizer-oa-damper-in",
+        "@id": "urn:ex/return-exhaust-junction-out-2",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-before-economizer-oa-damper"
+                "@id": "urn:ex/duct-before-ra-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -104,98 +117,69 @@
         ]
     },
     {
-        "@id": "urn:ex/oa-temp",
+        "@id": "urn:ex/clg-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#ChilledWaterValve"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Outside"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/clg-coil-valve-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/clg-coil-valve-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/outside-supply-junction",
-        "@type": [
-            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/outside-supply-junction-in-1"
-            },
-            {
-                "@id": "urn:ex/outside-supply-junction-in-2"
-            },
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/outside-supply-junction-in-3"
+                "@id": "urn:ex/clg-coil-valve-command"
             },
             {
-                "@id": "urn:ex/outside-supply-junction-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/clg-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/outside-air-junction-out-1",
+        "@id": "urn:ex/sa-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/duct-before-minimum-oa-damper"
+                "@id": "urn:ex/sa-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/sa-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/duct-after-clg-coil",
+        "@id": "urn:ex/pipe-chilled-water-supply",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/ra-fan-start-cmd",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/sa-out",
+        "@id": "urn:ex/filter-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/sa-out-connection"
+                "@id": "urn:ex/duct-before-filter"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -205,10 +189,7 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/sa-temp"
-            },
-            {
-                "@id": "urn:ex/supply-duct-static-pressure"
+                "@id": "urn:ex/ma-temp"
             }
         ]
     },
@@ -234,125 +215,89 @@
         ]
     },
     {
-        "@id": "urn:ex/ma-temp-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/filter-in"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:ex/ma-temp"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/filter-in",
+        "@id": "urn:ex/pipe-hot-water-supply",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/duct-before-filter"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/ma-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/clg-coil-valve-in",
+        "@id": "urn:ex/ea-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/pipe-chilled-water-return-before-valve"
+                "@id": "urn:ex/ea-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/economizer-oa-damper",
+        "@id": "urn:ex/outside-air-junction",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/economizer-oa-damper-in"
+                "@id": "urn:ex/outside-air-junction-in"
             },
             {
-                "@id": "urn:ex/economizer-oa-damper-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/economizer-oa-damper-command"
+                "@id": "urn:ex/outside-air-junction-out-1"
             },
             {
-                "@id": "urn:ex/economizer-oa-damper-position"
+                "@id": "urn:ex/outside-air-junction-out-2"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Economizer"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/sa-fan-out",
+        "@id": "urn:ex/ea-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/sa-out-connection"
-            }
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/ea-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/sa-out"
+                "@id": "urn:ex/ea-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/filter-differential-pressure",
+        "@id": "urn:ex/heat-coil-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/sa-temp",
+        "@id": "urn:ex/supply-duct-static-pressure",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -363,39 +308,39 @@
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ]
     },
     {
-        "@id": "urn:ex/heat-coil-air-temp",
+        "@id": "urn:ex/clg-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/pipe-chilled-water-return-before-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/outside-supply-junction-in-3",
+        "@id": "urn:ex/return-exhaust-junction-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-economizer-oa-damper"
+                "@id": "urn:ex/duct-after-ra-fan"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -405,106 +350,111 @@
         ]
     },
     {
-        "@id": "urn:ex/duct-before-economizer-oa-damper",
+        "@id": "urn:ex/pipe-chilled-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/heat-coil-air-temp-sensor",
+        "@id": "urn:ex/duct-before-ra-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/duct-after-htg-coil"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/heat-coil-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/htg-coil-valve-out",
+        "@id": "urn:ex/outside-air-junction-out-1",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/pipe-hot-water-return-after-valve"
+                "@id": "urn:ex/duct-before-minimum-oa-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/return-exhaust-junction-in",
+        "@id": "urn:ex/clg-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/duct-after-ra-fan"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/sa-out-connection",
+        "@id": "urn:ex/economizer-oa-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/economizer-oa-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/economizer-oa-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/ra-damper-position",
+        "@id": "urn:ex/ra-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Return"
+            }
+        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/return-exhaust-junction",
+        "@id": "urn:ex/ea-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/return-exhaust-junction-in"
-            },
-            {
-                "@id": "urn:ex/return-exhaust-junction-out-1"
-            },
-            {
-                "@id": "urn:ex/return-exhaust-junction-out-2"
+                "@id": "urn:ex/duct-before-ea-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -514,128 +464,117 @@
         ]
     },
     {
-        "@id": "urn:ex/filter-out",
+        "@id": "urn:ex/sa-fan",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Fan",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#FanWithVFD"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-filter"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/sa-fan-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/sa-fan-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/economizer-oa-damper-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/economizer-oa-damper"
+                "@id": "urn:ex/sa-fan-speed-cmd"
+            },
+            {
+                "@id": "urn:ex/sa-fan-start-cmd"
+            },
+            {
+                "@id": "urn:ex/sa-fan-start-status"
+            },
+            {
+                "@id": "urn:ex/sa-flow"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/economizer-oa-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Role-Supply"
             }
         ]
     },
     {
-        "@id": "urn:ex/htg-coil-valve-command",
+        "@id": "urn:ex/clg-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#CoolingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#ChilledWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/clg-coil-air-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/clg-coil-air-out"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/clg-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/clg-coil-water-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/pipe-chilled-water-return-before-valve",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
             }
         ]
     },
     {
-        "@id": "urn:ex/",
-        "@type": [
-            "http://www.w3.org/2002/07/owl#Ontology"
-        ]
-    },
-    {
-        "@id": "urn:ex/supply-duct-static-pressure-sensor",
+        "@id": "urn:ex/oa-flow-measurement-station",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/sa-out-connection"
+                "@id": "urn:ex/minimum-oa-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/supply-duct-static-pressure"
+                "@id": "urn:ex/oa-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/ea-damper-position",
+        "@id": "urn:ex/ra-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/ra-damper-in"
+            },
+            {
+                "@id": "urn:ex/ra-damper-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/ra-damper-command"
+            },
+            {
+                "@id": "urn:ex/ra-damper-position"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/duct-before-ra-damper",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Role-Return"
             }
         ]
     },
     {
-        "@id": "urn:ex/minimum-oa-damper-in",
+        "@id": "urn:ex/return-exhaust-junction-out-1",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-before-minimum-oa-damper"
+                "@id": "urn:ex/duct-before-ea-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -645,73 +584,85 @@
         ]
     },
     {
-        "@id": "urn:ex/pipe-chilled-water-return-after-valve",
+        "@id": "urn:ex/ra-fan-start-cmd",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/ra-damper-in",
+        "@id": "urn:ex/minimum-oa-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/duct-before-ra-damper"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/minimum-oa-damper-actuator",
+        "@id": "urn:ex/duct-after-ra-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/minimum-oa-damper"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/duct-before-economizer-oa-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/minimum-oa-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/clg-coil-water-in",
+        "@id": "urn:ex/clg-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/pipe-chilled-water-return-after-valve"
+                "@id": "urn:ex/clg-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/clg-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/economizer-oa-damper-command",
+        "@id": "urn:ex/sa-fan-speed-cmd",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Speed"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
@@ -726,13 +677,13 @@
         ]
     },
     {
-        "@id": "urn:ex/outside-supply-junction-in-2",
+        "@id": "urn:ex/clg-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-minimum-oa-damper"
+                "@id": "urn:ex/duct-after-clg-coil"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -742,158 +693,117 @@
         ]
     },
     {
-        "@id": "urn:ex/duct-after-ra-fan",
+        "@id": "urn:ex/oa-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Role-Outside"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/duct-after-ra-damper",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/minimum-oa-damper-out",
+        "@id": "urn:ex/sa-fan-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-minimum-oa-damper"
+                "@id": "urn:ex/duct-after-clg-coil"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/oa-flow"
-            },
-            {
-                "@id": "urn:ex/oa-temp"
-            }
         ]
     },
     {
-        "@id": "urn:ex/oa-flow",
+        "@id": "urn:ex/ea-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/ra-temp",
+        "@id": "urn:ex/ra-fan-start-status",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Return"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/ra-flow",
+        "@id": "urn:ex/ra-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/ra-temp-sensor",
+        "@id": "urn:ex/return-exhaust-junction",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/ra-in"
+                "@id": "urn:ex/return-exhaust-junction-in"
+            },
+            {
+                "@id": "urn:ex/return-exhaust-junction-out-1"
+            },
+            {
+                "@id": "urn:ex/return-exhaust-junction-out-2"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/ra-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/sa-fan-speed-cmd",
+        "@id": "urn:ex/minimum-oa-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Speed"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/duct-before-minimum-oa-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/outside-air-junction",
+        "@id": "urn:ex/oa-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/outside-air-junction-in"
-            },
-            {
-                "@id": "urn:ex/outside-air-junction-out-1"
-            },
-            {
-                "@id": "urn:ex/outside-air-junction-out-2"
-            }
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -902,7 +812,7 @@
         ]
     },
     {
-        "@id": "urn:ex/pipe-chilled-water-supply",
+        "@id": "urn:ex/pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -914,71 +824,58 @@
         ]
     },
     {
-        "@id": "urn:ex/ea-damper-actuator",
+        "@id": "urn:ex/clg-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/ea-damper"
+                "@id": "urn:ex/pipe-chilled-water-supply"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/ea-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/duct-after-minimum-oa-damper",
+        "@id": "urn:ex/oa-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/ra-fan",
+        "@id": "urn:ex/minimum-oa-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#FanWithVFD"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/ra-fan-in"
-            },
-            {
-                "@id": "urn:ex/ra-fan-out"
-            }
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/ra-fan-speed-cmd"
-            },
-            {
-                "@id": "urn:ex/ra-fan-start-cmd"
-            },
-            {
-                "@id": "urn:ex/ra-fan-start-status"
-            },
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/ra-flow"
+                "@id": "urn:ex/minimum-oa-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Return"
+                "@id": "urn:ex/minimum-oa-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/oa-in-connection",
+        "@id": "urn:ex/duct-after-htg-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -987,29 +884,29 @@
         ]
     },
     {
-        "@id": "urn:ex/htg-coil-valve-actuator",
+        "@id": "urn:ex/filter-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/htg-coil-valve"
+                "@id": "urn:ex/duct-after-filter"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/htg-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/outside-supply-junction-out",
+        "@id": "urn:ex/ra-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-before-filter"
+                "@id": "urn:ex/duct-after-ra-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -1019,146 +916,143 @@
         ]
     },
     {
-        "@id": "urn:ex/outside-supply-junction-in-1",
+        "@id": "urn:ex/htg-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/duct-after-ra-damper"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/ra-flow-sensor",
+        "@id": "urn:ex/ra-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/ra-fan"
+                "@id": "urn:ex/ra-in"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/ra-flow"
+                "@id": "urn:ex/ra-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/htg-coil",
+        "@id": "urn:ex/duct-before-ea-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/htg-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/htg-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/htg-coil-water-in"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/htg-coil-water-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/ea-damper-out",
+        "@id": "urn:ex/economizer-oa-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/ea-out-connection"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/ea-out"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/duct-after-filter",
+        "@id": "urn:ex/clg-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/pipe-chilled-water-return-after-valve"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/ra-in-connection",
+        "@id": "urn:ex/sa-fan-start-cmd",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/clg-coil-valve-command",
+        "@id": "urn:ex/htg-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
+                "@id": "urn:ex/htg-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/htg-coil-valve-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/htg-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/htg-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/ra-fan-speed-cmd",
+        "@id": "urn:ex/ma-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Speed"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
@@ -1179,119 +1073,124 @@
         ]
     },
     {
-        "@id": "urn:ex/minimum-oa-damper",
+        "@id": "urn:ex/",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://www.w3.org/2002/07/owl#Ontology"
+        ]
+    },
+    {
+        "@id": "urn:ex/ra-fan-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/minimum-oa-damper-in"
-            },
+                "@id": "urn:ex/duct-after-ra-fan"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/minimum-oa-damper-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/minimum-oa-damper-command"
+                "@id": "urn:ex/ra-fan-discharge-static-pressure"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/htg-coil",
+        "@type": [
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/htg-coil-air-in"
             },
             {
-                "@id": "urn:ex/minimum-oa-damper-position"
+                "@id": "urn:ex/htg-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/htg-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/htg-coil-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Outside"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/clg-coil-valve-actuator",
+        "@id": "urn:ex/ra-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/clg-coil-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/clg-coil-valve-command"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/pipe-hot-water-return-after-valve",
+        "@id": "urn:ex/sa-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/sa-fan"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/sa-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/ea-damper",
+        "@id": "urn:ex/heat-coil-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/ea-damper-in"
-            },
-            {
-                "@id": "urn:ex/ea-damper-out"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/ea-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/ea-damper-position"
+                "@id": "urn:ex/duct-after-htg-coil"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Exhaust"
+                "@id": "urn:ex/heat-coil-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/clg-coil-valve",
+        "@id": "urn:ex/economizer-oa-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#ChilledWaterValve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/clg-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/clg-coil-valve-out"
+                "@id": "urn:ex/duct-after-economizer-oa-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/clg-coil-valve-command"
-            },
-            {
-                "@id": "urn:ex/clg-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/htg-coil-valve-position",
+        "@id": "urn:ex/economizer-oa-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -1307,99 +1206,77 @@
         ]
     },
     {
-        "@id": "urn:ex/minimum-oa-damper-command",
+        "@id": "urn:ex/htg-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
+                "@id": "urn:ex/pipe-hot-water-return-after-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/htg-coil-valve-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/pipe-hot-water-return-after-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/multiple-zone-ahu",
+        "@id": "urn:ex/outside-supply-junction-out",
         "@type": [
-            "http://data.ashrae.org/standard223#AirHandlingUnit",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#MultiZoneVAVAirHandlingUnit"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/ea-out"
-            },
-            {
-                "@id": "urn:ex/oa-in"
-            },
-            {
-                "@id": "urn:ex/ra-in"
-            },
-            {
-                "@id": "urn:ex/sa-out"
+                "@id": "urn:ex/duct-before-filter"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/clg-coil"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/ra-flow",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/clg-coil-valve"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/ea-damper"
-            },
-            {
-                "@id": "urn:ex/economizer-oa-damper"
-            },
-            {
-                "@id": "urn:ex/filter"
-            },
-            {
-                "@id": "urn:ex/htg-coil"
-            },
-            {
-                "@id": "urn:ex/htg-coil-valve"
-            },
-            {
-                "@id": "urn:ex/minimum-oa-damper"
-            },
-            {
-                "@id": "urn:ex/outside-air-junction"
-            },
-            {
-                "@id": "urn:ex/outside-supply-junction"
-            },
-            {
-                "@id": "urn:ex/ra-damper"
-            },
-            {
-                "@id": "urn:ex/ra-fan"
-            },
-            {
-                "@id": "urn:ex/return-exhaust-junction"
-            },
-            {
-                "@id": "urn:ex/sa-fan"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/clg-coil-air-out",
+        "@id": "urn:ex/economizer-oa-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-clg-coil"
+                "@id": "urn:ex/duct-before-economizer-oa-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -1409,140 +1286,189 @@
         ]
     },
     {
-        "@id": "urn:ex/ra-fan-discharge-static-pressure",
+        "@id": "urn:ex/duct-after-ra-fan",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/duct-before-filter",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/oa-temp-sensor",
+        "@id": "urn:ex/minimum-oa-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/minimum-oa-damper-out"
+                "@id": "urn:ex/duct-after-minimum-oa-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/oa-flow"
+            },
             {
                 "@id": "urn:ex/oa-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/minimum-oa-damper-position",
+        "@id": "urn:ex/sa-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Supply"
+            }
+        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/htg-coil-valve",
+        "@id": "urn:ex/sa-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/htg-coil-valve-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/htg-coil-valve-out"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/duct-after-filter",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/htg-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/htg-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/ra-fan-out",
+        "@id": "urn:ex/duct-before-minimum-oa-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/duct-after-ra-fan"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/ra-fan-static-pressure-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/duct-after-ra-fan"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
                 "@id": "urn:ex/ra-fan-discharge-static-pressure"
             }
         ]
     },
     {
-        "@id": "urn:ex/ra-fan-static-pressure-sensor",
+        "@id": "urn:ex/oa-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/duct-after-ra-fan"
+                "@id": "urn:ex/minimum-oa-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/ra-fan-discharge-static-pressure"
+                "@id": "urn:ex/oa-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/duct-before-ea-damper",
+        "@id": "urn:ex/outside-air-junction-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/oa-in-connection"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/oa-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/ea-out",
+        "@id": "urn:ex/supply-duct-static-pressure-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/ea-out-connection"
+                "@id": "urn:ex/sa-out-connection"
             }
         ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/supply-duct-static-pressure"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/duct-after-minimum-oa-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
+        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
@@ -1550,73 +1476,67 @@
         ]
     },
     {
-        "@id": "urn:ex/htg-coil-valve-in",
+        "@id": "urn:ex/ra-fan-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/ra-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/ra-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/sa-fan",
+        "@id": "urn:ex/economizer-oa-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#FanWithVFD"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/sa-fan-in"
+                "@id": "urn:ex/economizer-oa-damper-in"
             },
             {
-                "@id": "urn:ex/sa-fan-out"
+                "@id": "urn:ex/economizer-oa-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/sa-fan-speed-cmd"
-            },
-            {
-                "@id": "urn:ex/sa-fan-start-cmd"
-            },
-            {
-                "@id": "urn:ex/sa-fan-start-status"
+                "@id": "urn:ex/economizer-oa-damper-command"
             },
             {
-                "@id": "urn:ex/sa-flow"
+                "@id": "urn:ex/economizer-oa-damper-position"
             }
         ],
         "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Supply"
+                "@id": "http://data.ashrae.org/standard223#Role-Economizer"
             }
         ]
     },
     {
-        "@id": "urn:ex/htg-coil-air-out",
+        "@id": "urn:ex/filter-differential-pressure",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/duct-after-htg-coil"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/heat-coil-air-temp"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ]
     },
@@ -1637,50 +1557,90 @@
         ]
     },
     {
-        "@id": "urn:ex/oa-in",
+        "@id": "urn:ex/filter",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Filter",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Filter"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/oa-in-connection"
+                "@id": "urn:ex/filter-in"
+            },
+            {
+                "@id": "urn:ex/filter-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/filter-differential-pressure"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/sa-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/sa-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/sa-temp"
+            },
+            {
+                "@id": "urn:ex/supply-duct-static-pressure"
+            }
         ]
     },
     {
-        "@id": "urn:ex/sa-temp-sensor",
+        "@id": "urn:ex/ea-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/sa-out"
+                "@id": "urn:ex/ea-damper-in"
+            },
+            {
+                "@id": "urn:ex/ea-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/sa-temp"
+                "@id": "urn:ex/ea-damper-command"
+            },
+            {
+                "@id": "urn:ex/ea-damper-position"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Exhaust"
             }
         ]
     },
     {
-        "@id": "urn:ex/oa-flow-measurement-station",
+        "@id": "urn:ex/minimum-oa-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/minimum-oa-damper-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/oa-flow"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
@@ -1697,143 +1657,209 @@
         ]
     },
     {
-        "@id": "urn:ex/ra-fan-in",
+        "@id": "urn:ex/multiple-zone-ahu",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#AirHandlingUnit",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#MultiZoneVAVAirHandlingUnit"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/ra-in-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/ea-out"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/oa-in"
+            },
+            {
+                "@id": "urn:ex/ra-in"
+            },
+            {
+                "@id": "urn:ex/sa-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/ra-in"
+                "@id": "urn:ex/clg-coil"
+            },
+            {
+                "@id": "urn:ex/clg-coil-valve"
+            },
+            {
+                "@id": "urn:ex/ea-damper"
+            },
+            {
+                "@id": "urn:ex/economizer-oa-damper"
+            },
+            {
+                "@id": "urn:ex/filter"
+            },
+            {
+                "@id": "urn:ex/htg-coil"
+            },
+            {
+                "@id": "urn:ex/htg-coil-valve"
+            },
+            {
+                "@id": "urn:ex/minimum-oa-damper"
+            },
+            {
+                "@id": "urn:ex/outside-air-junction"
+            },
+            {
+                "@id": "urn:ex/outside-supply-junction"
+            },
+            {
+                "@id": "urn:ex/ra-damper"
+            },
+            {
+                "@id": "urn:ex/ra-fan"
+            },
+            {
+                "@id": "urn:ex/return-exhaust-junction"
+            },
+            {
+                "@id": "urn:ex/sa-fan"
             }
         ]
     },
     {
-        "@id": "urn:ex/ea-out-connection",
+        "@id": "urn:ex/htg-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/htg-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/htg-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/supply-duct-static-pressure",
+        "@id": "urn:ex/ea-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Supply"
-            }
-        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/ra-damper-actuator",
+        "@id": "urn:ex/filter-differential-pressure-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#DifferentialSensor",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#DifferentialPressureSensor"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/ra-damper"
+                "@id": "urn:ex/filter-in"
+            },
+            {
+                "@id": "urn:ex/filter-out"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasObservationLocationHigh": [
             {
-                "@id": "urn:ex/ra-damper-command"
+                "@id": "urn:ex/filter-in"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/pipe-hot-water-return-before-valve",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocationLow": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/filter-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/filter-differential-pressure"
             }
         ]
     },
     {
-        "@id": "urn:ex/ra-damper-command",
+        "@id": "urn:ex/outside-supply-junction",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/outside-supply-junction-in-1"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/outside-supply-junction-in-2"
+            },
+            {
+                "@id": "urn:ex/outside-supply-junction-in-3"
+            },
+            {
+                "@id": "urn:ex/outside-supply-junction-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/ra-damper-out",
+        "@id": "urn:ex/minimum-oa-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-ra-damper"
+                "@id": "urn:ex/minimum-oa-damper-in"
+            },
+            {
+                "@id": "urn:ex/minimum-oa-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/minimum-oa-damper-command"
+            },
+            {
+                "@id": "urn:ex/minimum-oa-damper-position"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Outside"
             }
         ]
     },
     {
-        "@id": "urn:ex/pipe-hot-water-supply",
+        "@id": "urn:ex/outside-supply-junction-in-1",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/duct-after-ra-damper"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/outside-air-junction-out-2",
+        "@id": "urn:ex/outside-supply-junction-in-3",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-before-economizer-oa-damper"
+                "@id": "urn:ex/duct-after-economizer-oa-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -1843,56 +1869,53 @@
         ]
     },
     {
-        "@id": "urn:ex/ra-fan-start-status",
+        "@id": "urn:ex/pipe-hot-water-return-after-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/sa-flow-sensor",
+        "@id": "urn:ex/htg-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/sa-fan"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/sa-flow"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/sa-flow",
+        "@id": "urn:ex/duct-after-clg-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/clg-coil-water-out",
+        "@id": "urn:ex/htg-coil-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/pipe-chilled-water-supply"
+                "@id": "urn:ex/pipe-hot-water-supply"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -1902,43 +1925,45 @@
         ]
     },
     {
-        "@id": "urn:ex/filter-differential-pressure-sensor",
+        "@id": "urn:ex/oa-in",
         "@type": [
-            "http://data.ashrae.org/standard223#DifferentialSensor",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#DifferentialPressureSensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/filter-in"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/filter-out"
+                "@id": "urn:ex/oa-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocationHigh": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/filter-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/htg-coil-air-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocationLow": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/filter-out"
+                "@id": "urn:ex/duct-after-filter"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/filter-differential-pressure"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/outside-air-junction-in",
+        "@id": "urn:ex/sa-fan-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/oa-in-connection"
+                "@id": "urn:ex/sa-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -1948,92 +1973,96 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/oa-in"
+                "@id": "urn:ex/sa-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/clg-coil",
+        "@id": "urn:ex/ra-fan",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#ChilledWaterCoil"
+            "http://data.ashrae.org/standard223#Fan",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#FanWithVFD"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/clg-coil-air-in"
+                "@id": "urn:ex/ra-fan-in"
             },
             {
-                "@id": "urn:ex/clg-coil-air-out"
+                "@id": "urn:ex/ra-fan-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/ra-fan-speed-cmd"
             },
             {
-                "@id": "urn:ex/clg-coil-water-in"
+                "@id": "urn:ex/ra-fan-start-cmd"
             },
             {
-                "@id": "urn:ex/clg-coil-water-out"
+                "@id": "urn:ex/ra-fan-start-status"
+            },
+            {
+                "@id": "urn:ex/ra-flow"
             }
         ],
         "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+                "@id": "http://data.ashrae.org/standard223#Role-Return"
             }
         ]
     },
     {
-        "@id": "urn:ex/return-exhaust-junction-out-2",
+        "@id": "urn:ex/ma-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/duct-before-ra-damper"
+                "@id": "urn:ex/filter-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/ma-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/sa-fan-in",
+        "@id": "urn:ex/pipe-chilled-water-return-after-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/duct-after-clg-coil"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/economizer-oa-damper-position",
+        "@id": "urn:ex/ra-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/ra-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/ra-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/htg-coil-water-in",
+        "@id": "urn:ex/htg-coil-valve-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/pipe-hot-water-return-after-valve"
+                "@id": "urn:ex/pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -2043,94 +2072,81 @@
         ]
     },
     {
-        "@id": "urn:ex/sa-fan-start-status",
+        "@id": "urn:ex/ra-fan-discharge-static-pressure",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/duct-before-filter",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ]
     },
     {
-        "@id": "urn:ex/htg-coil-air-in",
+        "@id": "urn:ex/htg-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-filter"
+                "@id": "urn:ex/duct-after-htg-coil"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/heat-coil-air-temp"
+            }
         ]
     },
     {
-        "@id": "urn:ex/filter",
+        "@id": "urn:ex/ea-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Filter",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Filter"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/filter-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Position"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/filter-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/filter-differential-pressure"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/ra-damper",
+        "@id": "urn:ex/outside-air-junction-out-2",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/ra-damper-in"
-            },
-            {
-                "@id": "urn:ex/ra-damper-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/ra-damper-command"
-            },
-            {
-                "@id": "urn:ex/ra-damper-position"
+                "@id": "urn:ex/duct-before-economizer-oa-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Return"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/ea-damper-command",
+        "@id": "urn:ex/ra-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -2151,24 +2167,13 @@
         ]
     },
     {
-        "@id": "urn:ex/sa-fan-start-cmd",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/economizer-oa-damper-out",
+        "@id": "urn:ex/ra-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/duct-after-economizer-oa-damper"
+                "@id": "urn:ex/duct-before-ra-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -2178,18 +2183,13 @@
         ]
     },
     {
-        "@id": "urn:ex/ma-temp",
+        "@id": "urn:ex/sa-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     }
diff --git a/ibal.jsonld b/ibal.jsonld
index dbdd0efd..c59cb687 100644
--- a/ibal.jsonld
+++ b/ibal.jsonld
@@ -1,739 +1,807 @@
 [
     {
-        "@id": "http://example.org/IBAL#Jnc26-ICP2",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Jnc26-ICP2"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#v8_pos_fb",
+        "@id": "http://example.org/IBAL#exf1_power",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://qudt.org/vocab/quantitykind/Power"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/W"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "v8 pos fb"
+                "@value": "exf1 power"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_301T",
+        "@id": "http://example.org/IBAL#Jnc7-OCP2",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#Segment_1"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#vav1_t_in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 301T"
+                "@value": "Jnc7-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_64",
+        "@id": "http://example.org/IBAL#Channel_112",
         "@type": [
-            "http://data.ashrae.org/standard223#ElectricMeter"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#HeatingCoil_3"
+                "@id": "http://example.org/IBAL#Segment_18"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#vav2_heat_power"
+                "@id": "http://example.org/IBAL#zs4_out_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 64"
+                "@value": "Channel 112"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav4_heat_c",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_ICP_2",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogOutputObject",
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/bacnet/2020#description": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "VAV4 Heater Control Signal"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@value": "analog-output,1"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav4_heat_c"
+                "@value": "Motorized three way valve 3 ICP 2"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "analog-output"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://example.org/IBAL#VAV_4"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "0.0"
+                "@value": "Motorized three way valve 4 OCP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#ahu2_t_ra",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav4 heat c"
+                "@value": "ahu2 t ra"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_7",
+        "@id": "http://example.org/IBAL#Damper_5_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc3-OCP"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#VAV_3_ICP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#MotorizedDamper_5"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 7"
+                "@value": "Damper 5 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_307",
+        "@id": "http://example.org/IBAL#Damper_8_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#FlowSensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Segment_30"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://example.org/IBAL#exf2_f"
+                "@id": "http://example.org/IBAL#MotorizedDamper_8"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 307"
+                "@value": "Damper 8 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc28-OCP1",
+        "@id": "http://example.org/IBAL#Exhaust_Fan_2_Connection_2",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#connectsAt": [
             {
-                "@id": "http://example.org/IBAL#Segment_77"
+                "@id": "http://example.org/IBAL#Damper_9_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Fan_4_OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc28-OCP1"
+                "@value": "Exhaust Fan 2 Connection 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VFD_3_OCP",
+        "@id": "http://example.org/IBAL#ManualTwoWayValve_4_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VFD 3 OCP"
+                "@value": "Manual two way valve 4 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_4_VFD_4",
+        "@id": "http://example.org/IBAL#Damper_16_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Fan_4_E_ICP"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#VFD_4_OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://example.org/IBAL#MotorizedDamper_16"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 4 VFD 4"
+                "@value": "Damper 16 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_97_Temp",
+        "@id": "http://example.org/IBAL#CC_3_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://example.org/IBAL#AHU_3_Connection_2"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/value": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@value": "60"
+                "@id": "http://example.org/IBAL#CoolingCoil_3"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment_97_Temp"
+                "@value": " CC 3 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_1_OCP",
+        "@id": "http://example.org/IBAL#Jnc26-OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Segment_76"
+            }
+        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 1 OCP"
+                "@value": "Jnc26-OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_p_up",
+        "@id": "http://example.org/IBAL#WaterChiller_2",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Chiller"
         ],
-        "http://data.ashrae.org/standard223#hasValue": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "11296"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "http://example.org/IBAL#Chiller_2_Lower_ICP"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "http://example.org/IBAL#Chiller_2_Lower_OCP"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/PA"
-            }
-        ],
-        "http://qudt.org/schema/qudt/value": [
+                "@id": "http://example.org/IBAL#Chiller_2_Upper_ICP"
+            },
             {
-                "@value": "11296"
+                "@id": "http://example.org/IBAL#Chiller_2_Upper_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU1 P Up"
+                "@value": "Water Chiller 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_ICP_1",
+        "@id": "http://example.org/IBAL#Segment_71",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_105"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "http://example.org/IBAL#Jnc25-OCP2"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://example.org/IBAL#Jnc26-ICP1"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 1 ICP 1"
+                "@value": "Segment 71"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_17_OCP",
+        "@id": "http://example.org/IBAL#Jnc26-ICP2",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_17"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@value": "Jnc26-ICP2"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#HC_2_E_ICP",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_17"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 17 OCP"
+                "@value": "HC 2 E ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_20",
+        "@id": "http://example.org/IBAL#PlateHeatExchange_1_Upper_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc20-ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc20-OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc20-OCP2"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 20"
+                "@value": "Plate Heat Exchange 1 Upper OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Flow_6",
+        "@id": "http://example.org/IBAL#WaterChiller_1",
         "@type": [
-            "http://data.ashrae.org/standard223#FlowSensor"
+            "http://data.ashrae.org/standard223#Chiller"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#VAV_2_Connection_2"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "http://example.org/IBAL#Chiller_1_Lower_ICP"
+            },
             {
-                "@id": "http://example.org/IBAL#HC-3-OutletFlow"
+                "@id": "http://example.org/IBAL#Chiller_1_Lower_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Chiller_1_Upper_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Chiller_1_Upper_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Flow 6"
+                "@value": "Water Chiller 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc23-ICP2",
+        "@id": "http://example.org/IBAL#Segment_46",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_107"
+                "@id": "http://example.org/IBAL#Damper_16_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc15-OCP2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc23-ICP2"
+                "@value": "Segment 46"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_4_Connection_1",
+        "@id": "http://example.org/IBAL#Jnc33-OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#connectsAt": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Damper_4_OCP"
-            },
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://example.org/IBAL#HC_6_ICP"
+                "@value": "Jnc33-OCP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#d6_pos_c",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV 4 Connection 1"
+                "@value": "d6 pos c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_412",
+        "@id": "http://example.org/IBAL#Channel_16",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#PressureSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1"
+                "@id": "http://example.org/IBAL#Segment_30"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#v12_pos_c"
+                "@id": "http://example.org/IBAL#exf2_p_up"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 412"
+                "@value": "Channel 16"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc5-OCP",
+        "@id": "http://example.org/IBAL#PlateHeatExchange_1_ConnectionTemperature",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "60"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc5-OCP"
+                "@value": "Plate heat exchange 1 Connection temperature"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_68",
+        "@id": "http://example.org/IBAL#ManualTwoWayValve_2_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc24-OCP1"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_ICP_1"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 68"
+                "@value": "Manual two way valve 2 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#d5_pos_c",
+        "@id": "http://example.org/IBAL#PlateHeatExchange_2_Upper_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d5 pos c"
+                "@value": "Plate Heat Exchange 2 Upper ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_1",
+        "@id": "http://example.org/IBAL#Segment_99",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc1-ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc1-OCP1"
+                "@id": "http://example.org/IBAL#Jnc36-OCP1"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc1-OCP2"
+                "@id": "http://example.org/IBAL#Jnc37-ICP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 1"
+                "@value": "Segment 99"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu2_vfd",
+        "@id": "http://example.org/IBAL#PlateHeatExchanger_2",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogOutputObject",
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#HeatExchanger"
         ],
-        "http://data.ashrae.org/bacnet/2020#description": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "AHU2 Fan Speed"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
+                "@id": "http://example.org/IBAL#PlateHeatExchange_2_Lower_ICP"
+            },
             {
-                "@value": "analog-output,1"
+                "@id": "http://example.org/IBAL#PlateHeatExchange_2_Lower_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#PlateHeatExchange_2_Upper_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#PlateHeatExchange_2_Upper_OCP"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu1_vfd"
+                "@value": "Plate heat exchanger 1"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Channel_363",
+        "@type": [
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "analog-output"
+                "@id": "http://example.org/IBAL#MotorizedDamper_3"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#AHU_1"
+                "@id": "http://example.org/IBAL#d17_pos_fb"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "30.0"
+                "@value": "Channel 363"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#exf2_p_up",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/PA"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu2 vfd"
+                "@value": "exf2 p up"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc4-OCP2",
+        "@id": "http://example.org/IBAL#Segment_67",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Jnc23-OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc24-ICP"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc4-OCP2"
+                "@value": "Segment 67"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedDamper_8",
+        "@id": "http://example.org/IBAL#HVACSpace_2",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#Damper_8_ICP"
+                "@id": "http://example.org/IBAL#HVAC_Space_2_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Damper_8_OCP"
+                "@id": "http://example.org/IBAL#HVAC_Space_2_OCP"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "http://example.org/IBAL#zs2_t_sp_f"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized damper 8"
+                "@value": "HVACSpace 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_328",
+        "@id": "http://example.org/IBAL#Segment_60",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_11"
+                "@id": "http://example.org/IBAL#Jnc20-ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_OCP"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#d7_pos_fb"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 328"
+                "@value": "Segment 60"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VFD_2_ICP",
+        "@id": "http://example.org/IBAL#Jnc36-OCP1",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VFD 2 ICP"
+                "@value": "Jnc36-OCP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_308T",
+        "@id": "http://example.org/IBAL#Jnc22-OCP1",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Segment_10"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://example.org/IBAL#vav4_t_in"
+                "@value": "Jnc22-OCP1"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Segment_88_Temp",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
+            }
+        ],
+        "http://qudt.org/schema/qudt/value": [
+            {
+                "@value": "62"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 308T"
+                "@value": "Segment_88_Temp"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_99",
+        "@id": "http://example.org/IBAL#VAV3_FnB",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#FunctionBlock"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasInput": [
             {
-                "@id": "http://example.org/IBAL#Jnc36-OCP1"
+                "@id": "http://example.org/IBAL#d17_pos_fb"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc37-ICP"
+                "@id": "http://example.org/IBAL#vav3_f"
+            },
+            {
+                "@id": "http://example.org/IBAL#vav3_out_rtd"
+            },
+            {
+                "@id": "http://example.org/IBAL#vav3_t_in"
+            },
+            {
+                "@id": "http://example.org/IBAL#zs3_out_rtd"
+            },
+            {
+                "@id": "http://example.org/IBAL#zs3_t_sp_f"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasOutput": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#d17_pos_c"
+            },
+            {
+                "@id": "http://example.org/IBAL#vav3_heat_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 99"
+                "@value": "VAV3 Fn b"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_4_W_ICP",
+        "@id": "http://example.org/IBAL#CC_1_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#CoolingCoil_1"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -742,55 +810,63 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 4 W ICP"
+                "@value": " CC 1 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_394ow",
+        "@id": "http://example.org/IBAL#Segment_64",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Fan_3"
+                "@id": "http://example.org/IBAL#Jnc22-OCP2"
+            },
+            {
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_3_ICP"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#exf1_on"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 394ow"
+                "@value": "Segment 64"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1",
+        "@id": "http://example.org/IBAL#Junction_17",
         "@type": [
-            "http://data.ashrae.org/standard223#ThreeWayValve"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_ICP_1"
+                "@id": "http://example.org/IBAL#Jnc17-ICP"
             },
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_ICP_2"
+                "@id": "http://example.org/IBAL#Jnc17-ICP2"
             },
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_OCP"
+                "@id": "http://example.org/IBAL#Jnc17-OCP"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 1"
+                "@value": "Junction 17"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#PlateHeatExchange_1_Upper_ICP",
+        "@id": "http://example.org/IBAL#Damper_2_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -799,119 +875,122 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "http://example.org/IBAL#VAV_2_ICP"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Plate Heat Exchange 1 Upper ICP"
+                "@value": "Damper 2 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_4_OCP",
+        "@id": "http://example.org/IBAL#Junction_35",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#VAV_4_Connection_2"
+                "@id": "http://example.org/IBAL#Jnc35-ICP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc35-ICP2"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc35-OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV 4 OCP"
+                "@value": "Junction 35"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_9",
+        "@id": "http://example.org/IBAL#WaterPump_3_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#AHU_2_OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc4-ICP"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 9"
+                "@value": "Water pump 3 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#CC_2_Water_OCP",
+        "@id": "http://example.org/IBAL#Channel_72",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#ElectricMeter"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#VFD_4"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#AHU_2_G_OCP"
+                "@id": "http://example.org/IBAL#exf2_power"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": " CC 2 Water OCP"
+                "@value": "Channel 72"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_OCP",
+        "@id": "http://example.org/IBAL#Channel_80",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://example.org/IBAL#Segment_1"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5"
+                "@id": "http://example.org/IBAL#ahu2_out_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 5 OCP"
+                "@value": "Channel 80"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc28-OCP2",
+        "@id": "http://example.org/IBAL#HC_5_W_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc28-OCP2"
+                "@value": "HC 5 W OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_10_ICP",
+        "@id": "http://example.org/IBAL#PlateHeatExchange_2_Upper_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -920,75 +999,67 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 10 ICP"
+                "@value": "Plate Heat Exchange 2 Upper OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc38-OCP",
+        "@id": "http://example.org/IBAL#sl_out_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#Segment_101"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
+            }
+        ],
+        "http://qudt.org/schema/qudt/value": [
+            {
+                "@value": "64"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc38-OCP"
+                "@value": "sl out rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#oau_p_up",
+        "@id": "http://example.org/IBAL#oau_cc_rtd",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasValue": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "11297"
+                "@value": "45"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PA"
-            }
-        ],
-        "http://qudt.org/schema/qudt/value": [
-            {
-                "@value": "11297"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "oau p up"
+                "@value": "oau cc rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_22",
+        "@id": "http://example.org/IBAL#Jnc11-ICP1",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc6-OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc8-ICP"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -997,525 +1068,451 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 22"
+                "@value": "Jnc11-ICP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#zs4_heat_rtd",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasValue": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "68"
-            }
+            "http://data.ashrae.org/standard223#ThreeWayValve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_ICP_1"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
-            }
-        ],
-        "http://qudt.org/schema/qudt/value": [
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_ICP_2"
+            },
             {
-                "@value": "68"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "zs4 heat rtd"
+                "@value": "Motorized three way valve 4"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav1_t_in",
+        "@id": "http://example.org/IBAL#MotorizedDamper_8",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "VAV1 Supply Air Temperature"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
-            {
-                "@value": "analog-input,3"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
-            {
-                "@value": "vav1_t_in"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
-            {
-                "@value": "analog-input"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
-            {
-                "@id": "http://example.org/IBAL#VAV_1"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "70.0"
-            }
+            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "http://example.org/IBAL#Damper_8_ICP"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://example.org/IBAL#Damper_8_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav1 t in"
+                "@value": "Motorized damper 8"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_155",
+        "@id": "http://example.org/IBAL#ThermalStorage_1",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#Equipment"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#Segment_56"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "http://example.org/IBAL#ThermalStorage_1_ICP"
+            },
             {
-                "@id": "http://example.org/IBAL#ahu2_cc_in_rtd"
+                "@id": "http://example.org/IBAL#ThermalStorage_1_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 155"
+                "@value": "ThermalStorage 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc34-ICP",
+        "@id": "http://example.org/IBAL#Damper_7_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_7"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc34-ICP"
+                "@value": "Damper 7 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_35",
+        "@id": "http://example.org/IBAL#Segment_56",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc13-ICP1"
+                "@id": "http://example.org/IBAL#AHU_2_G_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc18-OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 35"
+                "@value": "Segment 56"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_2_E_ICP",
+        "@id": "http://example.org/IBAL#PlateHeatExchange_1_Lower_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 2 E ICP"
+                "@value": "Plate Heat Exchange 1 Lower OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VFD_5_OCP",
+        "@id": "http://example.org/IBAL#Damper_4_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VFD 5 OCP"
+                "@value": "Damper 4 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#exf2_p_up",
+        "@id": "http://example.org/IBAL#exf1_f",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PA"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "exf2 p up"
+                "@value": "exf1 f"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#zs1_out_rtd",
+        "@id": "http://example.org/IBAL#Channel_404",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "Zone1 Temperature"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
-            {
-                "@value": "analog-input,5"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
-            {
-                "@value": "zs1_out_rtd"
-            }
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "analog-input"
+                "@id": "http://example.org/IBAL#HeatingCoil_6"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#HVACZone_1"
+                "@id": "http://example.org/IBAL#vav4_heat_c"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "70.0"
+                "@value": "Channel 404"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#exf2_f",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "zs1_out_rtd"
+                "@value": "exf2 f"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc9-ICP",
+        "@id": "http://example.org/IBAL#ManualTwoWayValve_2",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#TwoWayValve"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_2_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_2_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc9-ICP"
+                "@value": "Manual two way valve 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_61",
+        "@id": "http://example.org/IBAL#Channel_201",
         "@type": [
-            "http://data.ashrae.org/standard223#ElectricMeter"
+            "http://data.ashrae.org/standard223#Controller"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#HeatingCoil_4"
+                "@id": "http://example.org/IBAL#MotorizedDamper_2"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#ahu1_heat_power"
+                "@id": "http://example.org/IBAL#d16_pos_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 61"
+                "@value": "Channel 201"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VFD_1_ICP",
+        "@id": "http://example.org/IBAL#Jnc38-ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@value": "VFD 1 ICP"
+                "@id": "http://example.org/IBAL#Segment_100"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#ManualTwoWayValve_4_OCP",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Manual two way valve 4 OCP"
+                "@value": "Jnc38-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_heat_power",
+        "@id": "http://example.org/IBAL#Channel_329",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://example.org/IBAL#MotorizedDamper_13"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/W"
+                "@id": "http://example.org/IBAL#d6_pos_fb"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU1 Heat Power"
+                "@value": "Channel 329"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_7_OCP",
+        "@id": "http://example.org/IBAL#WaterPump_1_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_7"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Damper 7 OCP"
+                "@value": "Water pump 1 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HVACZone_2",
+        "@id": "http://example.org/IBAL#Chiller_2_Lower_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone"
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasDomainSpace": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#HVACSpace_2"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HVACZone 2"
+                "@value": "Chiller 2 Lower OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_325T",
+        "@id": "http://example.org/IBAL#Segment_28",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_23"
+                "@id": "http://example.org/IBAL#Damper_8_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc10-ICP1"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#ahu1_t_ra"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 325T"
+                "@value": "Segment 28"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#CC_3_ICP",
+        "@id": "http://example.org/IBAL#vav2_out_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@value": "VAV2 Discharge Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://example.org/IBAL#AHU_3_ICP"
+                "@value": "analog-input,2"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "CC 3 ICP"
+                "@value": "vav2_out_rtd"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#MotorizedDamper_16",
-        "@type": [
-            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@id": "http://example.org/IBAL#Damper_16_ICP"
-            },
+                "@value": "analog-input"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#Damper_16_OCP"
+                "@id": "http://example.org/IBAL#VAV_2"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#present-value": [
             {
-                "@value": "Motorized damper 16"
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "70.0"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#v8_pos_c",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "v8 pos c"
+                "@value": "vav2 out rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_cc_out_rtd",
+        "@id": "http://example.org/IBAL#Damper_10_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU1 CC Out RTD"
+                "@value": "Damper 10 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_79",
+        "@id": "http://example.org/IBAL#HC_6_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#AHU_1_Connection_3"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://example.org/IBAL#ahu2_cc_rtd"
+                "@id": "http://example.org/IBAL#VAV_4_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 79"
+                "@value": "HC 6 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_41",
+        "@id": "http://example.org/IBAL#Junction_1",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Damper_13_OCP"
+                "@id": "http://example.org/IBAL#Jnc1-ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc14-ICP1"
+                "@id": "http://example.org/IBAL#Jnc1-OCP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc1-OCP2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -1525,33 +1522,25 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 41"
+                "@value": "Junction 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedDamper_15",
+        "@id": "http://example.org/IBAL#Junction_5",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Damper_15_ICP"
+                "@id": "http://example.org/IBAL#Jnc5-ICP1"
             },
             {
-                "@id": "http://example.org/IBAL#Damper_15_OCP"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "http://example.org/IBAL#Jnc5-ICP2"
+            },
             {
-                "@value": "Motorized damper 15"
+                "@id": "http://example.org/IBAL#Jnc5-OCP"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Jnc11-ICP2",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -1560,196 +1549,209 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc11-ICP2"
+                "@value": "Junction 5"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc4-ICP",
+        "@id": "http://example.org/IBAL#Channel_364",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#MotorizedDamper_4"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#d18_pos_fb"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc4-ICP"
+                "@value": "Channel 364"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_3",
+        "@id": "http://example.org/IBAL#Channel_9",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#PressureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#Fan_3_E_ICP"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Fan_3_ICP"
-            },
+                "@id": "http://example.org/IBAL#Segment_1"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#Fan_3_OCP"
+                "@id": "http://example.org/IBAL#ahu2_p_down"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 3"
+                "@value": "Channel 9"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#d6_pos_fb",
+        "@id": "http://example.org/IBAL#Channel_384",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#v13_pos_fb"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d6 pos fb"
+                "@value": "Channel 384"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc24-ICP",
+        "@id": "http://example.org/IBAL#Segment_38",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_67"
+                "@id": "http://example.org/IBAL#Damper_13_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc12-OCP1"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc24-ICP"
+                "@value": "Segment 38"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_397",
+        "@id": "http://example.org/IBAL#Jnc37-OCP2",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#HeatingCoil_4"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#ahu1_heat_c"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 397"
+                "@value": "Jnc37-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ManualTwoWayValve_1_OCP",
+        "@id": "http://example.org/IBAL#Damper_3_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Manual two way valve 1 OCP"
+                "@value": "Damper 3 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_in_rtd",
+        "@id": "http://example.org/IBAL#Segment_27",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasValue": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "45"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "http://example.org/IBAL#Fan_3_ICP"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://example.org/IBAL#Jnc9-OCP2"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 1 In RTD"
+                "@value": "Segment 27"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HeatingCoil_5",
+        "@id": "http://example.org/IBAL#ahu2_in_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#HC_5_E_ICP"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#HC_5_ICP"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#HC_5_OCP"
-            },
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://example.org/IBAL#HC_5_W_ICP"
-            },
+                "@value": "ahu2 in rtd"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Fan_5_E_ICP",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#HC_5_W_OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Heating coil 5"
+                "@value": "Fan 5 E ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#v12_pos_c",
+        "@id": "http://example.org/IBAL#vav4_heat_c",
         "@type": [
             "http://data.ashrae.org/bacnet/2020#AnalogOutputObject",
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@value": "AHU1 Cooling Coil Valve Control Signal"
+                "@value": "VAV4 Heater Control Signal"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@value": "analog-output,2"
+                "@value": "analog-output,1"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "v12_pos_c"
+                "@value": "vav4_heat_c"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-type": [
@@ -1759,7 +1761,7 @@
         ],
         "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#AHU_2"
+                "@id": "http://example.org/IBAL#VAV_4"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#present-value": [
@@ -1780,202 +1782,231 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "v12 pos c"
+                "@value": "vav4 heat c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedDamper_3",
+        "@id": "http://example.org/IBAL#Channel_134",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Damper_3_ICP"
-            },
+                "@id": "http://example.org/IBAL#HeatExchange_Connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#Damper_3_OCP"
+                "@id": "http://example.org/IBAL#hx3_pg_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized damper 3"
+                "@value": "Channel 129"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc31-ICP1",
+        "@id": "http://example.org/IBAL#Fan_3",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Fan"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#Fan_3_E_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Fan_3_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Fan_3_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc31-ICP1"
+                "@value": "Fan 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Flow_7",
+        "@id": "http://example.org/IBAL#VAV_2_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#FlowSensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#VAV_3_Connection_2"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#HC-5-OutletFlow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Flow 7"
+                "@value": "VAV 2 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_24",
+        "@id": "http://example.org/IBAL#VAV_1",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/bacnet/2020#BACnetDevice",
+            "http://data.ashrae.org/standard223#TerminalUnit"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/bacnet/2020#hasPort": [
             {
-                "@id": "http://example.org/IBAL#Jnc24-ICP"
-            },
+                "@id": "http://data.ashrae.org/bacnet/2020#P_47811"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://example.org/IBAL#Jnc24-OCP1"
+                "@id": "http://example.org/IBAL#HeatingCoil_2"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc24-OCP2"
+                "@id": "http://example.org/IBAL#MotorizedDamper_1"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#VAV_1_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#VAV_1_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 24"
+                "@value": "VAV 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_125",
+        "@id": "http://example.org/IBAL#vav3_t_in",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://example.org/IBAL#Segment_106"
+                "@value": "VAV3 Supply Air Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://example.org/IBAL#ahu2_cc_out_rtd"
+                "@value": "analog-input,3"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "Channel 125"
+                "@value": "vav3_t_in"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_ICP_1",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@id": "http://example.org/IBAL#Segment_106"
+                "@value": "analog-input"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#VAV_3"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/bacnet/2020#present-value": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2"
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "70.0"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 2 ICP 1"
+                "@value": "vav3 t in"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_13_ICP",
+        "@id": "http://example.org/IBAL#Channel_7",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#HumiditySensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#AHU_1_ICP"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_13"
+                "@id": "http://example.org/IBAL#ahu2_rh_up"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 13 ICP"
+                "@value": "Channel 7"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_2_G_OCP",
+        "@id": "http://example.org/IBAL#Junction_3",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Junction"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Jnc3-ICP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc3-ICP2"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc3-OCP"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 2 G OCP"
+                "@value": "Junction 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_13",
+        "@id": "http://example.org/IBAL#d5_pos_fb",
         "@type": [
-            "http://data.ashrae.org/standard223#PressureSensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#Segment_27"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#exf1_p_up"
+                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 13"
+                "@value": "d5 pos fb"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc11-OCP",
+        "@id": "http://example.org/IBAL#Segment_40",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Damper_14_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc14-ICP2"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -1984,152 +2015,144 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc11-OCP"
+                "@value": "Segment 40"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_335",
+        "@id": "http://example.org/IBAL#exf2_p_down",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_12"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#d8_pos_fb"
+                "@id": "http://qudt.org/vocab/unit/PA"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 335"
+                "@value": "exf2 p down"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_2_OCP",
+        "@id": "http://example.org/IBAL#WaterPump_2_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://example.org/IBAL#VAV_1_OCP"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "HC 2 OCP"
+                "@value": "Water pump 2 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_1_ICP",
+        "@id": "http://example.org/IBAL#MotorizedDamper_14",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+                "@id": "http://example.org/IBAL#Damper_14_ICP"
+            },
             {
-                "@id": "http://example.org/IBAL#AHU_1_ICP"
+                "@id": "http://example.org/IBAL#Damper_14_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 1 ICP"
+                "@value": "Motorized damper 14"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_4",
+        "@id": "http://example.org/IBAL#v13_pos_fb",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#BACnetDevice",
-            "http://data.ashrae.org/standard223#TerminalUnit"
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/bacnet/2020#hasPort": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://data.ashrae.org/bacnet/2020#P_47814"
+                "@value": "AHU2 Cooling Coil Feedback Signal"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "http://example.org/IBAL#HeatingCoil_6"
-            },
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_4"
+                "@value": "analog-input,2"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@id": "http://example.org/IBAL#VAV_4_ICP"
-            },
+                "@value": "v13_pos_fb"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@id": "http://example.org/IBAL#VAV_4_OCP"
+                "@value": "analog-input"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@value": "VAV 4"
+                "@id": "http://example.org/IBAL#AHU_1"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#CC_3_OCP",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/bacnet/2020#present-value": [
             {
-                "@id": "http://example.org/IBAL#AHU_3_Connection_2"
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "0.0"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#CoolingCoil_3"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": " CC 3 OCP"
+                "@value": "v13 pos fb"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#WaterPump_3_ICP",
+        "@id": "http://example.org/IBAL#ahu2_on",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Water pump 3 ICP"
+                "@value": "ahu2 on"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Chiller_2_Upper_ICP",
+        "@id": "http://example.org/IBAL#HC_4_W_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -2138,205 +2161,188 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Chiller 2 Upper ICP"
+                "@value": "HC 4 W OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_411",
+        "@id": "http://example.org/IBAL#AHU_3_G_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#v13_pos_c"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 411"
+                "@value": "AHU 3 G OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc2-OCP1",
+        "@id": "http://example.org/IBAL#Segment_14",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#HVAC_Space_2_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc5-ICP2"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Junction_2"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc2-OCP1"
+                "@value": "Segment 14"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_3",
+        "@id": "http://example.org/IBAL#Junction_32",
         "@type": [
-            "http://data.ashrae.org/standard223#HumiditySensor"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#HC_4_ICP"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "http://example.org/IBAL#Jnc32-ICP1"
+            },
             {
-                "@id": "http://example.org/IBAL#ahu1_rh_up"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "http://example.org/IBAL#Jnc32-ICP2"
+            },
             {
-                "@value": "Channel 3"
+                "@id": "http://example.org/IBAL#Jnc32-OCP"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Enclosure_2",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#HVACSpace_2"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Enclosure 2"
+                "@value": "Junction 32"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#PlateHetExchange_1_Bypass_Connection",
+        "@id": "http://example.org/IBAL#Segment_22",
         "@type": [
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#connectsAt": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_3_OCP"
+                "@id": "http://example.org/IBAL#Jnc6-OCP"
             },
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_ICP_2"
+                "@id": "http://example.org/IBAL#Jnc8-ICP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Plate Heat Exchange 1 Bypass Connection"
+                "@value": "Segment 22"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_on",
+        "@id": "http://example.org/IBAL#Segment_88",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://example.org/IBAL#Jnc32-OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc33-ICP1"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu1 on"
+                "@value": "Segment 88"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_7_W_OCP",
+        "@id": "http://example.org/IBAL#Jnc10-ICP2",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 7 W OCP"
+                "@value": "Jnc10-ICP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav1_heat_c",
+        "@id": "http://example.org/IBAL#Channel_395gw",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogOutputObject",
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "VAV1 Heater Control Signal"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
-            {
-                "@value": "analog-output,1"
-            }
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "vav1_heat_c"
+                "@id": "http://example.org/IBAL#AHU_3"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@value": "analog-output"
+                "@id": "http://example.org/IBAL#ahu2_on"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://example.org/IBAL#VAV_1"
+                "@value": "Channel 395gw"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Segment_85",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "0.0"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "http://example.org/IBAL#Jnc31-OCP"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://example.org/IBAL#Jnc32-ICP2"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav1 heat c"
+                "@value": "Segment 85"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc5-ICP2",
+        "@id": "http://example.org/IBAL#AHU_1_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -2347,149 +2353,111 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc5-ICP2"
+                "@value": "AHU 1 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_3_OCP",
+        "@id": "http://example.org/IBAL#Channel_17",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#PressureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "VAV 3 OCP"
+                "@id": "http://example.org/IBAL#Exhaust_Fan_2_Connection_2"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Chiller_2_Lower_OCP",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://example.org/IBAL#exf2_p_down"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Chiller 2 Lower OCP"
+                "@value": "Channel 17"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_4_OCP",
+        "@id": "http://example.org/IBAL#Segment_102",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@value": "Damper 4 OCP"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#pl_out_rtd",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "http://example.org/IBAL#Jnc19-ICP"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://example.org/IBAL#Jnc37-OCP2"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "pl out rtd"
+                "@value": "Segment 102"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_t_ra",
+        "@id": "http://example.org/IBAL#Channel_394ow",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasValue": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "65"
-            }
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://example.org/IBAL#Fan_3"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://example.org/IBAL#exf1_on"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 1 T RA"
+                "@value": "Channel 394ow"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_79",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_ICP_2",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Chiller_2_Lower_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc29-OCP"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 79"
+                "@value": "Motorized three way valve 4 ICP 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav3_f",
+        "@id": "http://example.org/IBAL#zs3_t_sp_f",
         "@type": [
             "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableProperty"
         ],
         "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@value": "VAV3 Airflow Rate"
+                "@value": "Zone3 Temperature Setpoint"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@value": "analog-input,4"
+                "@value": "analog-input,6"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "vav3_f"
+                "@value": "zs3_t_sp_f"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-type": [
@@ -2505,29 +2473,34 @@
         "http://data.ashrae.org/bacnet/2020#present-value": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "0.0"
+                "@value": "74.0"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Aspect-Setpoint"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav3 f"
+                "@value": "zs3 t sp f"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_5_OCP",
+        "@id": "http://example.org/IBAL#HC_1_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -2536,247 +2509,199 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://example.org/IBAL#VAV_3_OCP"
+                "@id": "http://example.org/IBAL#AHU_1_ICP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 5 OCP"
+                "@value": "HC 1 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_2_W_OCP",
+        "@id": "http://example.org/IBAL#Damper_19_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_19"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_19"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 2 W OCP"
+                "@value": "Damper 19 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#oau_p_down",
+        "@id": "http://example.org/IBAL#Chiller_2_Lower_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasValue": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "11270"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@value": "Chiller 2 Lower ICP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Segment_107",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/unit/PA"
+                "@id": "http://example.org/IBAL#Jnc23-ICP2"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_OCP"
             }
         ],
-        "http://qudt.org/schema/qudt/value": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "11270"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "oau p down"
+                "@value": "Segment 107"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc32-ICP1",
+        "@id": "http://example.org/IBAL#HC_7_W_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc32-ICP1"
+                "@value": "HC 7 W ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_30",
+        "@id": "http://example.org/IBAL#Chiller_1_Lower_Connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#connectsAt": [
             {
-                "@id": "http://example.org/IBAL#Fan_4_ICP"
+                "@id": "http://example.org/IBAL#Chiller_1_Lower_OCP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc10-OCP"
+                "@id": "http://example.org/IBAL#WaterPump_2_ICP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 30"
+                "@value": "Chiller 1 Lower Connection"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HeatingCoil_7",
+        "@id": "http://example.org/IBAL#Jnc31-ICP1",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#HC_7_E_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#HC_7_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#HC_7_OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#HC_7_W_ICP"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#HC_7_W_OCP"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Heating coil 7"
+                "@value": "Jnc31-ICP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV1_FnB",
+        "@id": "http://example.org/IBAL#Junction_2",
         "@type": [
-            "http://data.ashrae.org/standard223#FunctionBlock"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#hasInput": [
-            {
-                "@id": "http://example.org/IBAL#d15_pos_fb"
-            },
-            {
-                "@id": "http://example.org/IBAL#vav1_f"
-            },
-            {
-                "@id": "http://example.org/IBAL#vav1_out_rtd"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#vav1_t_in"
+                "@id": "http://example.org/IBAL#Jnc2-ICP"
             },
             {
-                "@id": "http://example.org/IBAL#zs1_out_rtd"
+                "@id": "http://example.org/IBAL#Jnc2-OCP"
             },
             {
-                "@id": "http://example.org/IBAL#zs1_t_sp_f"
+                "@id": "http://example.org/IBAL#Jnc2-OCP2"
             }
         ],
-        "http://data.ashrae.org/standard223#hasOutput": [
-            {
-                "@id": "http://example.org/IBAL#d15_pos_c"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#vav1_heat_c"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV1 Fn b"
+                "@value": "Junction 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_ICP_2",
+        "@id": "http://example.org/IBAL#Damper_14_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3"
+                "@id": "http://example.org/IBAL#MotorizedDamper_14"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 3 ICP 2"
+                "@value": "Damper 14 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_395bw",
+        "@id": "http://example.org/IBAL#Junction_29",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#AHU_3"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "http://example.org/IBAL#ahu1_on"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Channel 395bw"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Segment_2",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc1-OCP2"
+                "@id": "http://example.org/IBAL#Jnc29-ICP"
             },
             {
-                "@id": "http://example.org/IBAL#VAV_1_ICP"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Segment 2"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Segment_96",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc35-OCP"
+                "@id": "http://example.org/IBAL#Jnc29-OCP"
             },
             {
-                "@id": "http://example.org/IBAL#WaterPump_4_ICP"
+                "@id": "http://example.org/IBAL#Jnc29-OCP2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -2786,57 +2711,28 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 96"
+                "@value": "Junction 29"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_1_G_OCP",
+        "@id": "http://example.org/IBAL#Jnc13-OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "AHU 1 G OCP"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#HVACSpace_2",
-        "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#HVAC_Space_2_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#HVAC_Space_2_OCP"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "http://example.org/IBAL#zs2_t_sp_f"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HVACSpace 2"
+                "@value": "Jnc13-OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_15_OCP",
+        "@id": "http://example.org/IBAL#HC_2_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -2845,28 +2741,30 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_15"
+                "@id": "http://example.org/IBAL#VAV_1_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 15 OCP"
+                "@value": "HC 2 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_19",
+        "@id": "http://example.org/IBAL#VAV_3_Connection_2",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc5-OCP"
-            },
+                "@id": "http://example.org/IBAL#HVAC_Space_3_ICP"
+            }
+        ],
+        "http://data.ashrae.org/standard223#connectsAt": [
             {
-                "@id": "http://example.org/IBAL#Jnc7-ICP"
+                "@id": "http://example.org/IBAL#VAV_3_OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -2876,89 +2774,78 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 19"
+                "@value": "VAV 3 Connection 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_2",
+        "@id": "http://example.org/IBAL#Jnc18-OCP2",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#Fan_2_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Fan_2_OCP"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Fan_2_S_ICP"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 2"
+                "@value": "Jnc18-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#v12_pos_fb",
+        "@id": "http://example.org/IBAL#ahu1_cc_rtd",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "AHU1 Cooling Coil Feedback Signal"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
-            {
-                "@value": "analog-input,2"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@value": "v12_pos_fb"
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "45"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "analog-input"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#AHU_2"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "0.0"
+                "@value": "AHU 1 CC RTD"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#ahu2_t_sa",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "v12 pos fb"
+                "@value": "ahu 2 t sa"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_3_Connection_2",
+        "@id": "http://example.org/IBAL#Jnc9-OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -2967,374 +2854,312 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 3 Connection 2"
+                "@value": "Jnc9-OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Chiller_2_Lower_ICP",
+        "@id": "http://example.org/IBAL#Channel_37",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
+            "http://data.ashrae.org/standard223#HumiditySensor"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "Chiller 2 Lower ICP"
+                "@id": "http://example.org/IBAL#Segment_12"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#PlateHeatExchange_2_Lower_ICP",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#zs1_rh"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Plate Heat Exchange 2 Lower ICP"
+                "@value": "Channel 37"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_1_W_OCP",
+        "@id": "http://example.org/IBAL#VFD_5_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 1 W OCP"
+                "@value": "VFD 5 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc30-ICP2",
+        "@id": "http://example.org/IBAL#Jnc6-ICP1",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc30-ICP2"
+                "@value": "Jnc6-ICP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc19-OCP",
+        "@id": "http://example.org/IBAL#Channel_126",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
-            }
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "Jnc19-OCP"
+                "@id": "http://example.org/IBAL#Segment_88"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#WaterPump_2_OCP",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://example.org/IBAL#ts_in_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Water pump 2 OCP"
+                "@value": "Channel 126"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_16",
+        "@id": "http://example.org/IBAL#Segment_95",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc16-ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc16-OCP1"
+                "@id": "http://example.org/IBAL#Jnc24-OCP2"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc16-OCP2"
+                "@id": "http://example.org/IBAL#Jnc35-ICP1"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 16"
+                "@value": "Segment 95"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_27",
+        "@id": "http://example.org/IBAL#zs4_heat_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@id": "http://example.org/IBAL#Jnc27-ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc27-OCP1"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc27-OCP2"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "68"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "Junction 27"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Channel_394bw",
-        "@type": [
-            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#Fan_4"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/value": [
             {
-                "@id": "http://example.org/IBAL#exf2_on"
+                "@value": "68"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 394bw"
+                "@value": "zs4 heat rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#d16_pos_fb",
+        "@id": "http://example.org/IBAL#pl_in_rtd",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "VAV2 Damper Feedback Signal"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
-            {
-                "@value": "analog-input,1"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
-            {
-                "@value": "d16_pos_fb"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
-            {
-                "@value": "analog-input"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
-            {
-                "@id": "http://example.org/IBAL#VAV_2"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "0.0"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://qudt.org/schema/qudt/value": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@value": "68"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d16 pos fb"
+                "@value": "pl in rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#exf2_t_in",
+        "@id": "http://example.org/IBAL#Segment_59",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://example.org/IBAL#Jnc21-ICP2"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_OCP"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "exf2 t in"
+                "@value": "Segment 59"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_107",
+        "@id": "http://example.org/IBAL#Channel_83",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc23-ICP2"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_OCP"
+                "@id": "http://example.org/IBAL#AHU_3_ICP"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#oau_in_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 107"
+                "@value": "Channel 83"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_3_ICP",
+        "@id": "http://example.org/IBAL#Channel_328AO",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#MotorizedDamper_11"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#d7_pos_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 3 ICP"
+                "@value": "Channel 328AO"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_3_Connection_2",
+        "@id": "http://example.org/IBAL#Junction_33",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#HVAC_Space_3_ICP"
-            }
-        ],
-        "http://data.ashrae.org/standard223#connectsAt": [
+                "@id": "http://example.org/IBAL#Jnc33-ICP1"
+            },
             {
-                "@id": "http://example.org/IBAL#VAV_3_OCP"
+                "@id": "http://example.org/IBAL#Jnc33-OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc33-OCP2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV 3 Connection 2"
+                "@value": "Junction 33"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_14",
+        "@id": "http://example.org/IBAL#Channel_125",
         "@type": [
-            "http://data.ashrae.org/standard223#PressureSensor"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Exhaust_Fan_1_Connection_2"
+                "@id": "http://example.org/IBAL#Segment_106"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#exf1_p_down"
+                "@id": "http://example.org/IBAL#ahu2_cc_out_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 14"
+                "@value": "Channel 125"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_3_Connection_1",
+        "@id": "http://example.org/IBAL#Channel_84",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#connectsAt": [
-            {
-                "@id": "http://example.org/IBAL#Damper_3_OCP"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#HC_5_ICP"
+                "@id": "http://example.org/IBAL#AHU_3_Connection_2"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#oau_cc_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV 3 Connection 1"
+                "@value": "Channel 84"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc36-OCP2",
+        "@id": "http://example.org/IBAL#Segment_79",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_98"
+                "@id": "http://example.org/IBAL#Chiller_2_Lower_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc29-OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -3344,18 +3169,21 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc36-OCP2"
+                "@value": "Segment 79"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HVAC_Space_2_OCP",
+        "@id": "http://example.org/IBAL#VAV_2_Connection_1",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#connectsAt": [
             {
-                "@id": "http://example.org/IBAL#Segment_14"
+                "@id": "http://example.org/IBAL#Damper_2_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_3_ICP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -3365,66 +3193,74 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HVAC Space2 OCP"
+                "@value": "VAV 2 Connection 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_403",
+        "@id": "http://example.org/IBAL#ReturnAir-1-Flow",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@id": "http://example.org/IBAL#HeatingCoil_5"
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "500"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#vav3_heat_c"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+            }
+        ],
+        "http://qudt.org/schema/qudt/value": [
+            {
+                "@value": "500"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 403"
+                "@value": "Return Air 1 Flow"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#CC_1_Water_ICP",
+        "@id": "http://example.org/IBAL#Channel_308T",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://example.org/IBAL#Segment_10"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#AHU_1_G_ICP"
+                "@id": "http://example.org/IBAL#vav4_t_in"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "CC 1 Water ICP"
+                "@value": "Channel 308T"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_37",
+        "@id": "http://example.org/IBAL#Segment_87",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc37-ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc37-OCP1"
+                "@id": "http://example.org/IBAL#Jnc32-ICP1"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc37-OCP2"
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_5_OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -3434,249 +3270,303 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 37"
+                "@value": "Segment 87"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_110",
+        "@id": "http://example.org/IBAL#Channel_109",
         "@type": [
             "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_16"
+                "@id": "http://example.org/IBAL#HVAC_Space_3_ICP"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#zs3_out_rtd"
+                "@id": "http://example.org/IBAL#zs3_heat_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 110"
+                "@value": "Channel 109"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_42",
+        "@id": "http://example.org/IBAL#ahu1_rh_down",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "50"
             }
         ],
-        "http://data.ashrae.org/standard223#lnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#HC_4_ICP"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+            }
+        ],
+        "http://qudt.org/schema/qudt/value": [
+            {
+                "@value": "50"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 42"
+                "@value": "AHU 1 RH Down"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_126",
+        "@id": "http://example.org/IBAL#Jnc32-ICP2",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#Segment_88"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#ts_in_rtd"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 126"
+                "@value": "Jnc32-ICP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#PlateHeatExchange_1_Connection",
+        "@id": "http://example.org/IBAL#VFD_1_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#connectsAt": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_ICP_1"
-            },
+                "@id": "http://data.ashrae.org/standard223#Electricity-Signal"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://example.org/IBAL#PlateHeatExchange_1_Lower_OCP"
+                "@value": "VFD 1 OCP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Jnc3-OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Plate Heat Exchange 1 Connection"
+                "@value": "Jnc3-OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#zs4_t_sp_f",
+        "@id": "http://example.org/IBAL#ManualTwoWayValve_3",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
-            "http://data.ashrae.org/standard223#QuantifiableProperty"
+            "http://data.ashrae.org/standard223#TwoWayValve"
         ],
-        "http://data.ashrae.org/bacnet/2020#description": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "Zone4 Temperature Setpoint"
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_3_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_3_OCP"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "analog-input,6"
+                "@value": "Manual two way valve 3"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#VFD_3_OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "zs4_t_sp_f"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "analog-input"
+                "@value": "VFD 3 OCP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#oau_rh",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#VAV_4"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "74.0"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://qudt.org/schema/qudt/value": [
             {
-                "@id": "http://data.ashrae.org/standard223#Aspect-Setpoint"
+                "@value": "80"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@value": "oau rh"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#HVAC_Space_4_ICP",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "zs4 t sp f"
+                "@value": "HVAC Space 4 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_rh_down",
+        "@id": "http://example.org/IBAL#ch1_e_out_rtd",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasValue": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "50"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@value": "ch1 e out rtd"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Segment_97",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Jnc36-ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#WaterPump_4_OCP"
             }
         ],
-        "http://qudt.org/schema/qudt/value": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "50"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 1 RH Down"
+                "@value": "Segment 97"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_ICP_1",
+        "@id": "http://example.org/IBAL#Channel_61",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#ElectricMeter"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://example.org/IBAL#HeatingCoil_4"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4"
+                "@id": "http://example.org/IBAL#ahu1_heat_power"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 4 ICP 1"
+                "@value": "Channel 61"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_450",
+        "@id": "http://example.org/IBAL#Channel_76",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#VFD_2"
+                "@id": "http://example.org/IBAL#Segment_9"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#ahu1_vfd"
+                "@id": "http://example.org/IBAL#ahu1_out_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 450"
+                "@value": "Channel 76"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc10-OCP",
+        "@id": "http://example.org/IBAL#HC_3_W_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc10-OCP"
+                "@value": "HC 3 W OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc11-ICP1",
+        "@id": "http://example.org/IBAL#Segment_4",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Jnc2-OCP2"
+            },
+            {
+                "@id": "http://example.org/IBAL#VAV_2_ICP"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -3685,258 +3575,231 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc11-ICP1"
+                "@value": "Segment 4"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_5_OCP",
+        "@id": "http://example.org/IBAL#Jnc14-ICP1",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "http://example.org/IBAL#AHU_3_OCP"
-            }
-        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 5 OCP"
+                "@value": "Jnc14-ICP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_496",
+        "@id": "http://example.org/IBAL#Channel_397",
         "@type": [
             "http://data.ashrae.org/standard223#Controller"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_6"
+                "@id": "http://example.org/IBAL#HeatingCoil_4"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#d11_pos_fb"
+                "@id": "http://example.org/IBAL#ahu1_heat_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 496"
+                "@value": "Channel 397"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_308",
+        "@id": "http://example.org/IBAL#AHU_1_Connection_2",
         "@type": [
-            "http://data.ashrae.org/standard223#FlowSensor"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#connectsAt": [
             {
-                "@id": "http://example.org/IBAL#Segment_10"
+                "@id": "http://example.org/IBAL#CC_1_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_1_OCP"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#vav4_f"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 308"
+                "@value": "AHU 1 Connection 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC-3-OutletFlow",
+        "@id": "http://example.org/IBAL#Jnc29-OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasValue": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "500"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/PA"
-            }
-        ],
-        "http://qudt.org/schema/qudt/value": [
-            {
-                "@value": "500"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "HC 3 OutletFlow"
+                "@value": "Jnc29-OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_100",
+        "@id": "http://example.org/IBAL#HC_5_W_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc37-OCP1"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc38-ICP"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 100"
+                "@value": "HC 5 W ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HVACZone_3",
+        "@id": "http://example.org/IBAL#Fan_3_E_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone"
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasDomainSpace": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#HVACSpace_3"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HVACZone 3"
+                "@value": "Fan 3 E ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#WaterPump_1_OCP",
+        "@id": "http://example.org/IBAL#Damper_7_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_7"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Water pump 1 OCP"
+                "@value": "Damper 7 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#zs1_t_sp_f",
+        "@id": "http://example.org/IBAL#Channel_77",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
-            "http://data.ashrae.org/standard223#QuantifiableProperty"
-        ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "Zone1 Temperature Setpoint"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
-            {
-                "@value": "analog-input,6"
-            }
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "zs1_t_sp_f"
+                "@id": "http://example.org/IBAL#AHU_1_ICP"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@value": "analog-input"
+                "@id": "http://example.org/IBAL#ahu2_in_rtd"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://example.org/IBAL#VAV_1"
+                "@value": "Channel 77"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#MotorizedDamper_19",
+        "@type": [
+            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "74.0"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+                "@id": "http://example.org/IBAL#Damper_19_ICP"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Aspect-Setpoint"
+                "@id": "http://example.org/IBAL#Damper_19_OCP"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@value": "Motorized damper 19"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#HVAC_Space_2_ICP",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "zs1 t sp f"
+                "@value": "HVAC Space 2 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#pl_in_rtd",
+        "@id": "http://example.org/IBAL#Segment_3",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "http://example.org/IBAL#Jnc1-OCP1"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://example.org/IBAL#Jnc2-ICP"
             }
         ],
-        "http://qudt.org/schema/qudt/value": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "68"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "pl in rtd"
+                "@value": "Segment 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc25-OCP2",
+        "@id": "http://example.org/IBAL#Segment_70",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_71"
+                "@id": "http://example.org/IBAL#Jnc25-OCP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#PlateHeatExchange_2_Lower_ICP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -3946,55 +3809,39 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc25-OCP2"
+                "@value": "Segment 70"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu2_on",
+        "@id": "http://example.org/IBAL#ahu2_heat_power",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "ahu2 on"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#AHU_3_G_OCP",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://qudt.org/vocab/unit/W"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 3 G OCP"
+                "@value": "ahu2 heat power"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc14-OCP",
+        "@id": "http://example.org/IBAL#Segment_35",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_42"
+                "@id": "http://example.org/IBAL#Jnc13-ICP1"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -4004,98 +3851,82 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc14-OCP"
+                "@value": "Segment 35"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc21-OCP",
+        "@id": "http://example.org/IBAL#VFD_3",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
-            }
+            "http://data.ashrae.org/standard223#VariableFrequencyDrive"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "Jnc21-OCP"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#PlateHeatExchange_2_Upper_OCP",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "http://example.org/IBAL#VFD_3_ICP"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#VFD_3_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Plate Heat Exchange 2 Upper OCP"
+                "@value": "VFD 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_24",
+        "@id": "http://example.org/IBAL#pl_f",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Damper_8_ICP"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#Jnc8-OCP2"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/GAL_US-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 24"
+                "@value": "pl f"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_451",
+        "@id": "http://example.org/IBAL#Flow_6",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#FlowSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#VFD_1"
+                "@id": "http://example.org/IBAL#VAV_2_Connection_2"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#ahu2_vfd"
+                "@id": "http://example.org/IBAL#HC-3-OutletFlow"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 451"
+                "@value": "Flow 6"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_5",
+        "@id": "http://example.org/IBAL#Segment_19",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Damper_5_ICP"
+                "@id": "http://example.org/IBAL#Jnc5-OCP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc2-OCP"
+                "@id": "http://example.org/IBAL#Jnc7-ICP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -4105,131 +3936,84 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 5"
+                "@value": "Segment 19"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_303T",
+        "@id": "http://example.org/IBAL#Jnc18-ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#Segment_7"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#vav3_t_in"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 303T"
+                "@value": "Jnc18-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_4_E_ICP",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "HC 4 E ICP"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#exf1_p_up",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/PA"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "exf1 p up"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#vav3_t_in",
+        "@id": "http://example.org/IBAL#ahu1_vfd",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/bacnet/2020#AnalogOutputObject",
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@value": "VAV3 Supply Air Temperature"
+                "@value": "AHU1 Fan Speed"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@value": "analog-input,3"
+                "@value": "analog-output,1"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "vav3_t_in"
+                "@value": "ahu1_vfd"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@value": "analog-input"
+                "@value": "analog-output"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#VAV_3"
+                "@id": "http://example.org/IBAL#AHU_2"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#present-value": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "70.0"
+                "@value": "30.0"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav3 t in"
+                "@value": "ahu1 vfd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#CC_1_ICP",
+        "@id": "http://example.org/IBAL#Jnc9-ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#CoolingCoil_1"
-            }
-        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
@@ -4237,179 +4021,96 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "CC 1 ICP"
+                "@value": "Jnc9-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedDamper_7",
+        "@id": "http://example.org/IBAL#oau_p_up",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#Damper_7_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Damper_7_OCP"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@value": "Motorized damper 7"
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "11297"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#ahu2_cc_rtd",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "ahu2 cc rtd"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Jnc6-OCP",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Segment_22"
+                "@id": "http://qudt.org/vocab/unit/PA"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/value": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@value": "11297"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc6-OCP"
+                "@value": "oau p up"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_61",
+        "@id": "http://example.org/IBAL#Segment_25",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc20-OCP"
+                "@id": "http://example.org/IBAL#Damper_6_OCP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc21-ICP1"
+                "@id": "http://example.org/IBAL#Jnc9-ICP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Segment 61"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Fan_4",
-        "@type": [
-            "http://data.ashrae.org/standard223#Fan"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#Fan_4_E_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Fan_4_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Fan_4_OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 4"
+                "@value": "Segment 25"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_381",
+        "@id": "http://example.org/IBAL#Channel_334",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#FlowSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5"
+                "@id": "http://example.org/IBAL#Segment_20"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#v8_pos_c"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Channel 381"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#VAV_2_OCP",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "VAV 2 OCP"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Jnc18-OCP",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#ahu2_f_ra"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc18-OCP"
+                "@value": "Channel 334"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#d17_pos_fb",
+        "@id": "http://example.org/IBAL#d15_pos_fb",
         "@type": [
             "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@value": "VAV3 Damper Feedback Signal"
+                "@value": "VAV1 Damper Feedback Signal"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-identifier": [
@@ -4419,7 +4120,7 @@
         ],
         "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "d17_pos_fb"
+                "@value": "d15_pos_fb"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-type": [
@@ -4429,7 +4130,7 @@
         ],
         "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#VAV_3"
+                "@id": "http://example.org/IBAL#VAV_1"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#present-value": [
@@ -4450,52 +4151,44 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d17 pos fb"
+                "@value": "d15 pos fb"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_87",
+        "@id": "http://example.org/IBAL#Enclosure_3",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc32-ICP1"
-            },
-            {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_5_OCP"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#HVACSpace_3"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 87"
+                "@value": "Enclosure 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc19-OCP2",
+        "@id": "http://example.org/IBAL#HC_1_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc19-OCP2"
+                "@value": "HC 1 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc25-ICP",
+        "@id": "http://example.org/IBAL#Jnc33-ICP1",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -4506,231 +4199,208 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc25-ICP"
+                "@value": "Jnc33-ICP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_69",
+        "@id": "http://example.org/IBAL#Fan_2_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc25-ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_OCP"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 69"
+                "@value": "Fan 2 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#CC_2_OCP",
+        "@id": "http://example.org/IBAL#Hydronic",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
+            "http://data.ashrae.org/standard223#System"
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#hasMember": [
+            {
+                "@id": "http://example.org/IBAL#CoolingCoil_1"
+            },
             {
                 "@id": "http://example.org/IBAL#CoolingCoil_2"
+            },
+            {
+                "@id": "http://example.org/IBAL#PlateHeatExchanger_1"
+            },
+            {
+                "@id": "http://example.org/IBAL#PlateHeatExchanger_2"
+            },
+            {
+                "@id": "http://example.org/IBAL#ThermalStorage_1"
+            },
+            {
+                "@id": "http://example.org/IBAL#WaterChiller_1"
+            },
+            {
+                "@id": "http://example.org/IBAL#WaterChiller_2"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": " CC 2 OCP"
+                "@value": "Hydronic"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_4_E_ICP",
+        "@id": "http://example.org/IBAL#Channel_412",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
-            }
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "Fan 4 E ICP"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#HC_2_W_ICP",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://example.org/IBAL#v12_pos_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 2 W ICP"
+                "@value": "Channel 412"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#WaterChiller_1",
+        "@id": "http://example.org/IBAL#ManualTwoWayValve_5_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Chiller"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#Chiller_1_Lower_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Chiller_1_Lower_OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Chiller_1_Upper_ICP"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Chiller_1_Upper_OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Water Chiller 1"
+                "@value": "Manual two way valve 5 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_328AO",
+        "@id": "http://example.org/IBAL#VAV_4_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_11"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#d7_pos_c"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 328AO"
+                "@value": "VAV 4 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc34-OCP2",
+        "@id": "http://example.org/IBAL#MotorizedDamper_17",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#Damper_17_ICP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc34-OCP2"
+                "@value": "Motorized damper 17"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HeatingCoil_6",
+        "@id": "http://example.org/IBAL#Exhaust_Fan_1_Connection_2",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#HC_6_E_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#HC_6_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#HC_6_OCP"
-            },
+        "http://data.ashrae.org/standard223#connectsAt": [
             {
-                "@id": "http://example.org/IBAL#HC_6_W_ICP"
+                "@id": "http://example.org/IBAL#Damper_7_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#HC_6_W_OCP"
+                "@id": "http://example.org/IBAL#Fan_3_OCP"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "IBAL:VAV4_OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Heating coil 6"
+                "@value": "Exhaust Fan 1 Connection 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#oau_rh",
+        "@id": "http://example.org/IBAL#ahu1_p_up",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
+        "http://data.ashrae.org/standard223#hasValue": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "11296"
+            }
+        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/PA"
             }
         ],
         "http://qudt.org/schema/qudt/value": [
             {
-                "@value": "80"
+                "@value": "11296"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "oau rh"
+                "@value": "AHU1 P Up"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_13_OCP",
+        "@id": "http://example.org/IBAL#Channel_128",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#Segment_67"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_13"
+                "@id": "http://example.org/IBAL#sl_out_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 13 OCP"
+                "@value": "Channel 128"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc15-ICP",
+        "@id": "http://example.org/IBAL#Fan_5_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -4741,396 +4411,405 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc15-ICP"
+                "@value": "Fan 5 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_363",
+        "@id": "http://example.org/IBAL#Jnc9-OCP2",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_3"
+                "@id": "http://example.org/IBAL#Segment_27"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#d17_pos_fb"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 363"
+                "@value": "Jnc9-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#CC_2_ICP",
+        "@id": "http://example.org/IBAL#Jnc30-ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
-            {
-                "@id": "http://example.org/IBAL#CoolingCoil_2"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "CC 2 ICP"
+                "@value": "Jnc30-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav3_heat_c",
+        "@id": "http://example.org/IBAL#Jnc35-ICP1",
         "@type": [
-            "http://data.ashrae.org/standard223#AnalogOutputObject",
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "VAV3 Heater Control Signal"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "analog-output,1"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav3_heat_c"
+                "@value": "Jnc35-ICP1"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#ahu2_cc_out_rtd",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "analog-output"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#VAV_3"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "0.0"
+                "@value": "ahu2 cc out rtd"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Channel_155",
+        "@type": [
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://example.org/IBAL#Segment_56"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://example.org/IBAL#ahu2_cc_in_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav3 heat c"
+                "@value": "Channel 155"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_59",
+        "@id": "http://example.org/IBAL#Damper_11_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc21-ICP2"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_OCP"
+                "@id": "http://example.org/IBAL#Segment_35"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_11"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 59"
+                "@value": "Damper 11 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_62",
+        "@id": "http://example.org/IBAL#AHU_2",
         "@type": [
-            "http://data.ashrae.org/standard223#ElectricMeter"
+            "http://data.ashrae.org/standard223#AirHandlingUnit"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/bacnet/2020#hasPort": [
             {
-                "@id": "http://example.org/IBAL#HeatingCoil_1"
+                "@id": "http://data.ashrae.org/bacnet/2020#P_47815"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://example.org/IBAL#ahu2_heat_power"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "http://example.org/IBAL#CoolingCoil_2"
+            },
             {
-                "@value": "Channel 62"
+                "@id": "http://example.org/IBAL#Fan_2"
+            },
+            {
+                "@id": "http://example.org/IBAL#HeatingCoil_4"
+            },
+            {
+                "@id": "http://example.org/IBAL#VFD_2"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Jnc29-OCP2",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#AHU_2_G_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#AHU_2_G_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#AHU_2_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#AHU_2_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#AHU_2_S_ICP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc29-OCP2"
+                "@value": "AHU 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_16_ICP",
+        "@id": "http://example.org/IBAL#vav4_t_in",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@value": "VAV4 Supply Air Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_16"
+                "@value": "analog-input,3"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "Damper 16 ICP"
+                "@value": "vav4_t_in"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Chiller_1_Lower_OCP",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
+                "@value": "analog-input"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@value": "Chiller 1 Lower OCP"
+                "@id": "http://example.org/IBAL#VAV_4"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Jnc37-OCP2",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#present-value": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "70.0"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "Jnc37-OCP2"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Jnc3-ICP2",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc3-ICP2"
+                "@value": "vav4 t in"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ManualTwoWayValve_3_ICP",
+        "@id": "http://example.org/IBAL#ahu2_rh_up",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Manual two way valve 3 ICP"
+                "@value": "ahu2 rh up"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_197",
+        "@id": "http://example.org/IBAL#Channel_88",
         "@type": [
-            "http://data.ashrae.org/standard223#FlowSensor"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_105"
+                "@id": "http://example.org/IBAL#VAV_2_Connection_2"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#ahu1_f_cc"
+                "@id": "http://example.org/IBAL#vav2_out_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 197"
+                "@value": "Channel 88"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ManualTwoWayValve_1_ICP",
+        "@id": "http://example.org/IBAL#Segment_105",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#AHU_1_G_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_ICP_1"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Manual two way valve 1 ICP"
+                "@value": "Segment 105"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_1_ICP",
+        "@id": "http://example.org/IBAL#ahu1_f_cc",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "40"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "Fan 1 ICP"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Channel_334",
-        "@type": [
-            "http://data.ashrae.org/standard223#FlowSensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#Segment_20"
+                "@id": "http://qudt.org/vocab/unit/GAL_US-PER-MIN"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/value": [
             {
-                "@id": "http://example.org/IBAL#ahu2_f_ra"
+                "@value": "40"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 334"
+                "@value": "Channel 197"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu2_out_rtd",
+        "@id": "http://example.org/IBAL#exf2_on",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/bacnet/2020#description": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "AHU2 Supply Air Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@value": "analog-input,2"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu2_out_rtd"
+                "@value": "exf2 on"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Damper_19_OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "analog-input"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://example.org/IBAL#AHU_1"
+                "@id": "http://example.org/IBAL#MotorizedDamper_19"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "70.0"
+                "@value": "Damper 19 OCP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#WaterTempSensor_13",
+        "@type": [
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://example.org/IBAL#Segment_97"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://example.org/IBAL#Segment_97_Temp"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu2 out rtd"
+                "@value": "Water Temp Sensor 13"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_OCP",
+        "@id": "http://example.org/IBAL#HC_3_E_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
-            {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 3 OCP"
+                "@value": "HC 3 E ICP"
             }
         ]
     },
@@ -5156,30 +4835,33 @@
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HVAC_Space_4_ICP",
+        "@id": "http://example.org/IBAL#Segment_93",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Jnc34-OCP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc35-ICP2"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HVAC Space 4 ICP"
+                "@value": "Segment 93"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc35-ICP2",
+        "@id": "http://example.org/IBAL#AHU_1_G_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Segment_93"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -5188,45 +4870,540 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc35-ICP2"
+                "@value": "AHU 1 G OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav2_out_rtd",
+        "@id": "http://example.org/IBAL#d6_pos_fb",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "d6 pos fb"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#HeatingCoil_7",
+        "@type": [
+            "http://data.ashrae.org/standard223#HeatingCoil"
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "http://example.org/IBAL#HC_7_E_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_7_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_7_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_7_W_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_7_W_OCP"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Heating coil 7"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#hx1_pg_rtd",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
+            }
+        ],
+        "http://qudt.org/schema/qudt/value": [
+            {
+                "@value": "70"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "hx1_hw_rtd"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Channel_90",
+        "@type": [
+            "http://data.ashrae.org/standard223#TemperatureSensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "http://example.org/IBAL#VAV_4_Connection_2"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#vav4_out_rtd"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Channel 90"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Jnc12-OCP1",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Jnc12-OCP1"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#HC_4_OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "HC 4 OCP"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Fan_1_OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "http://example.org/IBAL#AHU_1_OCP"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Fan 1 OCP"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Jnc19-ICP",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Segment_102"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Jnc19-ICP"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#ahu1_on",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/V"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "ahu1 on"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Jnc38-OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Segment_101"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Jnc38-OCP"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Jnc17-OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Segment_52"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Jnc17-OCP"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Jnc21-OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Jnc21-OCP"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#AirFlow",
+        "@type": [
+            "http://data.ashrae.org/standard223#System"
+        ],
+        "http://data.ashrae.org/standard223#hasMember": [
+            {
+                "@id": "http://example.org/IBAL#AHU_1"
+            },
+            {
+                "@id": "http://example.org/IBAL#AHU_2"
+            },
+            {
+                "@id": "http://example.org/IBAL#Fan_3"
+            },
+            {
+                "@id": "http://example.org/IBAL#Fan_4"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_10"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_11"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_12"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_13"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_14"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_15"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_16"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_17"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_18"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_19"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_5"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_6"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_7"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_8"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_9"
+            },
+            {
+                "@id": "http://example.org/IBAL#VAV_1"
+            },
+            {
+                "@id": "http://example.org/IBAL#VAV_2"
+            },
+            {
+                "@id": "http://example.org/IBAL#VAV_3"
+            },
+            {
+                "@id": "http://example.org/IBAL#VAV_4"
+            },
+            {
+                "@id": "http://example.org/IBAL#VFD_3"
+            },
+            {
+                "@id": "http://example.org/IBAL#VFD_4"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "AirFlow"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#d18_pos_fb",
+        "@type": [
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
         "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@value": "VAV2 Discharge Temperature"
+                "@value": "VAV4 Damper Feedback Signal"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
+            {
+                "@value": "analog-input,1"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-name": [
+            {
+                "@value": "d18_pos_fb"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-type": [
+            {
+                "@value": "analog-input"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
+            {
+                "@id": "http://example.org/IBAL#VAV_4"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#present-value": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "0.0"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/V"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "d18 pos fb"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Channel_496",
+        "@type": [
+            "http://data.ashrae.org/standard223#Controller"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_6"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#d11_pos_fb"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Channel 496"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Channel_454",
+        "@type": [
+            "http://data.ashrae.org/standard223#Controller"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "http://example.org/IBAL#VFD_4"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#exf2_vfd"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Channel 454"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#VAV_3_ICP",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "VAV 3 ICP"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Segment_96",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Jnc35-OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#WaterPump_4_ICP"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Segment 96"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Fan_1",
+        "@type": [
+            "http://data.ashrae.org/standard223#Fan"
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "http://example.org/IBAL#Fan_1_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Fan_1_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Fan_1_S_ICP"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Fan 1"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Damper_3_ICP",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "analog-input,2"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@value": "vav2_out_rtd"
+                "@id": "http://example.org/IBAL#VAV_3_ICP"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "analog-input"
+                "@value": "Damper 3 ICP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#ManualTwoWayValve_3_OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#VAV_2"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "70.0"
+                "@value": "Manual two way valve 3 OCP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#exf1_t_in",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -5240,72 +5417,229 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav2 out rtd"
+                "@value": "exf1 t in"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_3_OCP",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_ICP_2",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 3 OCP"
+                "@value": "Motorized three way valve 1 ICP 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_124",
+        "@id": "http://example.org/IBAL#Channel_327",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#FlowSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_105"
+                "@id": "http://example.org/IBAL#Segment_39"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#ahu1_cc_out_rtd"
+                "@id": "http://example.org/IBAL#ahu2_f_sa"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 124"
+                "@value": "Channel 327"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc29-ICP",
+        "@id": "http://example.org/IBAL#HC_2_W_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc29-ICP"
+                "@value": "HC 2 W ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#d18_pos_fb",
+        "@id": "http://example.org/IBAL#Jnc6-OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Segment_22"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Jnc6-OCP"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#zs2_rh",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasValue": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "50"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "zs2 rh"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#HVACZone_3",
+        "@type": [
+            "http://data.ashrae.org/standard223#Zone"
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomainSpace": [
+            {
+                "@id": "http://example.org/IBAL#HVACSpace_3"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "HVACZone 3"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Damper_18_OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_18"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Damper 18 OCP"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#MotorizedDamper_2",
+        "@type": [
+            "http://data.ashrae.org/standard223#Damper"
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "http://example.org/IBAL#Damper_2_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Damper_2_OCP"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Motorized damper 2"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Junction_13",
+        "@type": [
+            "http://data.ashrae.org/standard223#Junction"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Jnc13-ICP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc13-ICP2"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc13-OCP"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Junction 13"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#ahu2_f_ra",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "ahu2 f ra"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#d16_pos_fb",
         "@type": [
             "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@value": "VAV4 Damper Feedback Signal"
+                "@value": "VAV2 Damper Feedback Signal"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-identifier": [
@@ -5315,7 +5649,7 @@
         ],
         "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "d18_pos_fb"
+                "@value": "d16_pos_fb"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-type": [
@@ -5325,7 +5659,7 @@
         ],
         "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#VAV_4"
+                "@id": "http://example.org/IBAL#VAV_2"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#present-value": [
@@ -5346,51 +5680,76 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d18 pos fb"
+                "@value": "d16 pos fb"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Chiller_1_Upper_ICP",
+        "@id": "http://example.org/IBAL#VAV_4",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/bacnet/2020#BACnetDevice",
+            "http://data.ashrae.org/standard223#TerminalUnit"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#hasPort": [
+            {
+                "@id": "http://data.ashrae.org/bacnet/2020#P_47814"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "http://example.org/IBAL#HeatingCoil_6"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_4"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://example.org/IBAL#VAV_4_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#VAV_4_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Chiller 1 Upper ICP"
+                "@value": "VAV 4"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav3_heat_power",
+        "@id": "http://example.org/IBAL#Channel_64",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#ElectricMeter"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://example.org/IBAL#HeatingCoil_3"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/W"
+                "@id": "http://example.org/IBAL#vav2_heat_power"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav3 heat power"
+                "@value": "Channel 64"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc6-ICP2",
+        "@id": "http://example.org/IBAL#VAV_1_Connection_2",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#HVAC_Space_1_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#VAV_1_OCP"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -5399,138 +5758,165 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc6-ICP2"
+                "@value": "VAV 1 Connection 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_17",
+        "@id": "http://example.org/IBAL#Fan_5",
         "@type": [
-            "http://data.ashrae.org/standard223#PressureSensor"
+            "http://data.ashrae.org/standard223#Fan"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#Exhaust_Fan_2_Connection_2"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "http://example.org/IBAL#Fan_5_E_ICP"
+            },
             {
-                "@id": "http://example.org/IBAL#exf2_p_down"
+                "@id": "http://example.org/IBAL#Fan_5_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Fan_5_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 17"
+                "@value": "Fan 5"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#WaterPump_3",
+        "@id": "http://example.org/IBAL#HVACSpace_3",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#WaterPump_3_ICP"
+                "@id": "http://example.org/IBAL#HVAC_Space_3_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#WaterPump_3_OCP"
+                "@id": "http://example.org/IBAL#HVAC_Space_3_OCP"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@value": "Water pump 3"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#HC_6_W_ICP",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://example.org/IBAL#zs3_t_sp_f"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 6 W ICP"
+                "@value": "HVACSpace 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedDamper_5",
+        "@id": "http://example.org/IBAL#AHU_1",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
+            "http://data.ashrae.org/standard223#AirHandlingUnit"
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "http://example.org/IBAL#CoolingCoil_1"
+            },
+            {
+                "@id": "http://example.org/IBAL#Fan_1"
+            },
+            {
+                "@id": "http://example.org/IBAL#HeatingCoil_1"
+            },
+            {
+                "@id": "http://example.org/IBAL#VFD_1"
+            }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#Damper_5_ICP"
+                "@id": "http://example.org/IBAL#AHU_1_G_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Damper_5_OCP"
+                "@id": "http://example.org/IBAL#AHU_1_G_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#AHU_1_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#AHU_1_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#AHU_1_S_ICP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized damper 5"
+                "@value": "AHU 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_9",
+        "@id": "http://example.org/IBAL#Segment_37",
         "@type": [
-            "http://data.ashrae.org/standard223#PressureSensor"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_1"
+                "@id": "http://example.org/IBAL#Damper_12_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc13-ICP2"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#ahu2_p_down"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 9"
+                "@value": "Segment 37"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_76",
+        "@id": "http://example.org/IBAL#Segment_89",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_9"
+                "@id": "http://example.org/IBAL#Jnc33-OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#ThermalStorage_1_ICP"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#ahu1_out_rtd"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 76"
+                "@value": "Segment 89"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_67",
+        "@id": "http://example.org/IBAL#Junction_21",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc23-OCP"
+                "@id": "http://example.org/IBAL#Jnc21-ICP1"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc24-ICP"
+                "@id": "http://example.org/IBAL#Jnc21-ICP2"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc21-OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -5540,179 +5926,185 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 67"
+                "@value": "Junction 21"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_1_VFD_1",
+        "@id": "http://example.org/IBAL#PlateHeatExchange_2_Lower_ICP",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Plate Heat Exchange 2 Lower ICP"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Segment_2",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Fan_1_S_ICP"
+                "@id": "http://example.org/IBAL#Jnc1-OCP2"
             },
             {
-                "@id": "http://example.org/IBAL#VFD_1_OCP"
+                "@id": "http://example.org/IBAL#VAV_1_ICP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Electricity-Signal"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 1 to VFD 1"
+                "@value": "Segment 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV2_FnB",
+        "@id": "http://example.org/IBAL#HVACSpace_1",
         "@type": [
-            "http://data.ashrae.org/standard223#FunctionBlock"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasInput": [
-            {
-                "@id": "http://example.org/IBAL#d16_pos_fb"
-            },
-            {
-                "@id": "http://example.org/IBAL#vav2_f"
-            },
-            {
-                "@id": "http://example.org/IBAL#vav2_out_rtd"
-            },
-            {
-                "@id": "http://example.org/IBAL#vav2_t_in"
-            },
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#zs2_out_rtd"
+                "@id": "http://example.org/IBAL#HVAC_Space_1_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#zs2_t_sp_f"
+                "@id": "http://example.org/IBAL#HVAC_Space_1_OCP"
             }
         ],
-        "http://data.ashrae.org/standard223#hasOutput": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://example.org/IBAL#d16_pos_c"
-            },
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://example.org/IBAL#vav2_heat_c"
+                "@id": "http://example.org/IBAL#zs1_t_sp_f"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV2 Fn b"
+                "@value": "HVACSpace 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_360",
+        "@id": "http://example.org/IBAL#v12_pos_fb",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_2"
+                "@value": "AHU1 Cooling Coil Feedback Signal"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://example.org/IBAL#d16_pos_fb"
+                "@value": "analog-input,2"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "Channel 360"
+                "@value": "v12_pos_fb"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Jnc20-OCP2",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@value": "analog-input"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@value": "Jnc20-OCP2"
+                "@id": "http://example.org/IBAL#AHU_2"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#present-value": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "0.0"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Channel_405",
-        "@type": [
-            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#HeatingCoil_1"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#ahu2_heat_c"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 405"
+                "@value": "v12 pos fb"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_3_G_ICP",
+        "@id": "http://example.org/IBAL#HC_5_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "http://example.org/IBAL#VAV_3_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 3 G ICP"
+                "@value": "HC 5 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu2_heat_c",
+        "@id": "http://example.org/IBAL#Segment_52",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#lnx": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://example.org/IBAL#AHU_3_ICP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu2 heat c"
+                "@value": "Segment 52"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_26",
+        "@id": "http://example.org/IBAL#Segment_41",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Damper_10_ICP"
+                "@id": "http://example.org/IBAL#Damper_13_OCP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc9-OCP"
+                "@id": "http://example.org/IBAL#Jnc14-ICP1"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -5722,151 +6114,174 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 26"
+                "@value": "Segment 41"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc35-OCP",
+        "@id": "http://example.org/IBAL#Channel_301",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#FlowSensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#Segment_2"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#vav1_f"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc35-OCP"
+                "@value": "Channel 301"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ThermalStorage_1_OCP",
+        "@id": "http://example.org/IBAL#Segment_44",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Jnc15-ICP"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Thermal Storage 1 OCP"
+                "@value": "Segment 44"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VFD_2",
+        "@id": "http://example.org/IBAL#VAV4_FnB",
         "@type": [
-            "http://data.ashrae.org/standard223#VariableFrequencyDrive"
+            "http://data.ashrae.org/standard223#FunctionBlock"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasInput": [
             {
-                "@id": "http://example.org/IBAL#VFD_2_ICP"
+                "@id": "http://example.org/IBAL#d18_pos_fb"
             },
             {
-                "@id": "http://example.org/IBAL#VFD_2_OCP"
+                "@id": "http://example.org/IBAL#vav4_f"
+            },
+            {
+                "@id": "http://example.org/IBAL#vav4_out_rtd"
+            },
+            {
+                "@id": "http://example.org/IBAL#vav4_t_in"
+            },
+            {
+                "@id": "http://example.org/IBAL#zs4_out_rtd"
+            },
+            {
+                "@id": "http://example.org/IBAL#zs4_t_sp_f"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasOutput": [
             {
-                "@id": "http://example.org/IBAL#ahu1_vfd"
+                "@id": "http://example.org/IBAL#d18_pos_c"
+            },
+            {
+                "@id": "http://example.org/IBAL#vav4_heat_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VFD 2"
+                "@value": "VAV4 Fn b"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HVACSpace_3",
+        "@id": "http://example.org/IBAL#oau_p_down",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@id": "http://example.org/IBAL#HVAC_Space_3_ICP"
-            },
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "11270"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#HVAC_Space_3_OCP"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/unit/PA"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/value": [
             {
-                "@id": "http://example.org/IBAL#zs3_t_sp_f"
+                "@value": "11270"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HVACSpace 3"
+                "@value": "oau p down"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu2_heat_rtd",
+        "@id": "http://example.org/IBAL#PlateHeatExchange_1_Lower_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu2 heat rtd"
+                "@value": "Plate Heat Exchange 1 Lower ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_18_ICP",
+        "@id": "http://example.org/IBAL#Channel_334T",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#Segment_20"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_18"
+                "@id": "http://example.org/IBAL#ahu2_t_ra"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 18 ICP"
+                "@value": "Channel 334T"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_23",
+        "@id": "http://example.org/IBAL#Junction_20",
         "@type": [
             "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc23-ICP"
+                "@id": "http://example.org/IBAL#Jnc20-ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc23-ICP2"
+                "@id": "http://example.org/IBAL#Jnc20-OCP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc23-OCP"
+                "@id": "http://example.org/IBAL#Jnc20-OCP2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -5876,158 +6291,107 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 23"
+                "@value": "Junction 20"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_107",
+        "@id": "http://example.org/IBAL#Damper_12_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#HVAC_Space_2_ICP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://example.org/IBAL#zs2_heat_rtd"
+                "@id": "http://example.org/IBAL#MotorizedDamper_12"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 107"
+                "@value": "Damper 12 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AirFlow",
+        "@id": "http://example.org/IBAL#ahu2_vfd",
         "@type": [
-            "http://data.ashrae.org/standard223#System"
+            "http://data.ashrae.org/bacnet/2020#AnalogOutputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMember": [
-            {
-                "@id": "http://example.org/IBAL#AHU_1"
-            },
-            {
-                "@id": "http://example.org/IBAL#AHU_2"
-            },
-            {
-                "@id": "http://example.org/IBAL#Fan_3"
-            },
-            {
-                "@id": "http://example.org/IBAL#Fan_4"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_10"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_11"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_12"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_13"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_14"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_15"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_16"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_17"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_18"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_19"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_5"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_6"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_7"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_8"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_9"
-            },
-            {
-                "@id": "http://example.org/IBAL#VAV_1"
-            },
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://example.org/IBAL#VAV_2"
-            },
+                "@value": "AHU2 Fan Speed"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://example.org/IBAL#VAV_3"
-            },
+                "@value": "analog-output,1"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@id": "http://example.org/IBAL#VAV_4"
-            },
+                "@value": "ahu1_vfd"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@id": "http://example.org/IBAL#VFD_3"
-            },
+                "@value": "analog-output"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#VFD_4"
+                "@id": "http://example.org/IBAL#AHU_1"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#present-value": [
             {
-                "@value": "AirFlow"
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "30.0"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#ahu2_cc_out_rtd",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu2 cc out rtd"
+                "@value": "ahu2 vfd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc10-ICP1",
+        "@id": "http://example.org/IBAL#exf1_vfd",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc10-ICP1"
+                "@value": "exf1 vfd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_329",
+        "@id": "http://example.org/IBAL#Channel_329AO",
         "@type": [
             "http://data.ashrae.org/standard223#Controller"
         ],
@@ -6036,241 +6400,210 @@
                 "@id": "http://example.org/IBAL#MotorizedDamper_13"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#observers": [
             {
-                "@id": "http://example.org/IBAL#d6_pos_fb"
+                "@id": "http://example.org/IBAL#d6_pos_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 329"
+                "@value": "Channel 329AO"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_1_G_ICP",
+        "@id": "http://example.org/IBAL#PlateHeatExchange_1_Connection",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#connectsAt": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_ICP_1"
+            },
             {
-                "@value": "AHU 1 G ICP"
+                "@id": "http://example.org/IBAL#PlateHeatExchange_1_Lower_OCP"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Jnc22-ICP",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc22-ICP"
+                "@value": "Plate Heat Exchange 1 Connection"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc30-OCP",
+        "@id": "http://example.org/IBAL#HC_4_W_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Segment_84"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc30-OCP"
+                "@value": "HC 4 W ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc35-ICP1",
+        "@id": "http://example.org/IBAL#VFD_5",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#VariableFrequencyDrive"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#VFD_5_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#VFD_5_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc35-ICP1"
+                "@value": "VFD 5"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_404",
+        "@id": "http://example.org/IBAL#Fan_4_VFD_4",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#HeatingCoil_6"
+                "@id": "http://example.org/IBAL#Fan_4_E_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#VFD_4_OCP"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#vav4_heat_c"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 404"
+                "@value": "Fan 4 VFD 4"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc36-OCP1",
+        "@id": "http://example.org/IBAL#ManualTwoWayValve_2_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc36-OCP1"
+                "@value": "Manual two way valve 2 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu2_fan_power",
+        "@id": "http://example.org/IBAL#Jnc7-ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/W"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu2 fan power"
+                "@value": "Jnc7-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu2_p_down",
+        "@id": "http://example.org/IBAL#Channel_5",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "Static Pressure Measurement Downstream Fan"
-            }
+            "http://data.ashrae.org/standard223#PressureSensor"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "analog-input,3"
+                "@id": "http://example.org/IBAL#Segment_9"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@value": "ahu2_p_down"
+                "@id": "http://example.org/IBAL#ahu1_p_down"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "analog-input"
+                "@value": "Channel 5"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#HVACSpace_4",
+        "@type": [
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#AHU_1"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+                "@id": "http://example.org/IBAL#HVAC_Space_4_ICP"
+            },
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "0.0"
+                "@id": "http://example.org/IBAL#HVAC_Space_4_OCP"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PA"
+                "@id": "http://example.org/IBAL#zs4_t_sp_f"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu2 p down"
+                "@value": "HVACSpace 4"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VFD_1",
+        "@id": "http://example.org/IBAL#Segment_86",
         "@type": [
-            "http://data.ashrae.org/standard223#VariableFrequencyDrive"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#VFD_1_ICP"
+                "@id": "http://example.org/IBAL#Jnc27-OCP2"
             },
             {
-                "@id": "http://example.org/IBAL#VFD_1_OCP"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "VFD 1"
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_5_ICP"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#WaterPump_1_ICP",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Water pump 1 ICP"
+                "@value": "Segment 86"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HVAC_Space_1_OCP",
+        "@id": "http://example.org/IBAL#Jnc17-ICP2",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Segment_12"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -6279,166 +6612,169 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HVAC Space1 OCP"
+                "@value": "Jnc17-ICP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Chiller_1_Lower_Connection",
+        "@id": "http://example.org/IBAL#ahu1_in_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#connectsAt": [
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@id": "http://example.org/IBAL#Chiller_1_Lower_OCP"
-            },
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "45"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#WaterPump_2_ICP"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Chiller 1 Lower Connection"
+                "@value": "AHU 1 In RTD"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_90",
+        "@id": "http://example.org/IBAL#vav4_f",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://example.org/IBAL#Jnc33-OCP2"
-            },
+                "@value": "VAV4 Airflow Rate"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_ICP_2"
+                "@value": "analog-input,4"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@value": "VAV4-Airflow"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@value": "Segment 90"
+                "@value": "analog-input"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#AHU_1_Zone",
-        "@type": [
-            "http://data.ashrae.org/standard223#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://example.org/IBAL#VAV_4"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomainSpace": [
+        "http://data.ashrae.org/bacnet/2020#present-value": [
             {
-                "@id": "http://example.org/IBAL#HVACSpace_1"
-            },
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "0.0"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#HVACSpace_2"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 1 Zone"
+                "@value": "vav4 f"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_1",
+        "@id": "http://example.org/IBAL#Channel_59",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#BACnetDevice",
-            "http://data.ashrae.org/standard223#TerminalUnit"
-        ],
-        "http://data.ashrae.org/bacnet/2020#hasPort": [
-            {
-                "@id": "http://data.ashrae.org/bacnet/2020#P_47811"
-            }
+            "http://data.ashrae.org/standard223#ElectricMeter"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "http://example.org/IBAL#HeatingCoil_2"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_1"
+                "@id": "http://example.org/IBAL#VFD_2"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#VAV_1_ICP"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#VAV_1_OCP"
+                "@id": "http://example.org/IBAL#ahu1_fan_power"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV 1"
+                "@value": "Channel 59"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_f_sa",
+        "@id": "http://example.org/IBAL#WaterPump_1_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasValue": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "600"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@value": "Water pump 1 ICP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Segment_47",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://example.org/IBAL#Damper_16_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc16-ICP"
             }
         ],
-        "http://qudt.org/schema/qudt/value": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "600"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 1 F SA"
+                "@value": "Segment 47"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#zs3_t_sp_f",
+        "@id": "http://example.org/IBAL#zs2_out_rtd",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
-            "http://data.ashrae.org/standard223#QuantifiableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@value": "Zone3 Temperature Setpoint"
+                "@value": "Zone2 Temperature"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@value": "analog-input,6"
+                "@value": "analog-input,5"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "zs3_t_sp_f"
+                "@value": "Zone2 Temperature"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-type": [
@@ -6448,18 +6784,13 @@
         ],
         "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#VAV_3"
+                "@id": "http://example.org/IBAL#VAV_2"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#present-value": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "74.0"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Aspect-Setpoint"
+                "@value": "70.0"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
@@ -6474,484 +6805,433 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "zs3 t sp f"
+                "@value": "zs2 out rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#oau_out_rtd",
+        "@id": "http://example.org/IBAL#Channel_310AO",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#hasValue": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "45"
+                "@id": "http://example.org/IBAL#MotorizedDamper_14"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://example.org/IBAL#d5_pos_c"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@value": "Channel 310AO"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Chiller_2_Upper_ICP",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/value": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "45"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "oau out rtd"
+                "@value": "Chiller 2 Upper ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedDamper_1",
+        "@id": "http://example.org/IBAL#Segment_7",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Damper_1_ICP"
+                "@id": "http://example.org/IBAL#Jnc3-OCP"
             },
             {
-                "@id": "http://example.org/IBAL#Damper_1_OCP"
+                "@id": "http://example.org/IBAL#VAV_3_ICP"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized damper 1"
+                "@value": "Segment 7"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_1",
+        "@id": "http://example.org/IBAL#vav2_heat_c",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#AnalogOutputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://example.org/IBAL#Fan_1_ICP"
-            },
+                "@value": "VAV1 Heater Control Signal"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://example.org/IBAL#Fan_1_OCP"
-            },
+                "@value": "analog-output,1"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@id": "http://example.org/IBAL#Fan_1_S_ICP"
+                "@value": "vav2_heat_c"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-type": [
+            {
+                "@value": "analog-output"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
+            {
+                "@id": "http://example.org/IBAL#VAV_2"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#present-value": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "0.0"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 1"
+                "@value": "vav2 heat c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedDamper_13",
+        "@id": "http://example.org/IBAL#MotorizedDamper_1",
         "@type": [
             "http://data.ashrae.org/standard223#Damper"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#Damper_13_ICP"
+                "@id": "http://example.org/IBAL#Damper_1_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Damper_13_OCP"
+                "@id": "http://example.org/IBAL#Damper_1_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized damper 13"
+                "@value": "Motorized damper 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc2-OCP",
+        "@id": "http://example.org/IBAL#vav1_t_in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@value": "VAV1 Supply Air Temperature"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Jnc2-OCP"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#HC_4_OCP",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
+            {
+                "@value": "analog-input,3"
+            }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@value": "vav1_t_in"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@value": "HC 4 OCP"
+                "@value": "analog-input"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#HC_5_W_OCP",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://example.org/IBAL#VAV_1"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#present-value": [
             {
-                "@value": "HC 5 W OCP"
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "70.0"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#HVACZone_4",
-        "@type": [
-            "http://data.ashrae.org/standard223#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomainSpace": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#HVACSpace_4"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HVACZone 4"
+                "@value": "vav1 t in"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#CC_3_W_ICP",
+        "@id": "http://example.org/IBAL#HC_3_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "CC 3 W ICP"
+                "@value": "HC 3 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_4",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3",
         "@type": [
-            "http://data.ashrae.org/standard223#PressureSensor"
+            "http://data.ashrae.org/standard223#ThreeWayValve"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#AHU_2_Connection_3"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_ICP_1"
+            },
             {
-                "@id": "http://example.org/IBAL#ahu1_p_up"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_ICP_2"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 4"
+                "@value": "Motorized three way valve 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#d18_pos_c",
+        "@id": "http://example.org/IBAL#zs4_out_rtd",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogOutputObject",
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@value": "VAV4 Damper Control Signal"
+                "@value": "Zone4 Temperature"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@value": "analog-output,2"
+                "@value": "analog-input,5"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "d18_pos_c"
+                "@value": "zs4_out_rtd"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@value": "analog-output"
+                "@value": "analog-input"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#VAV_4"
+                "@id": "http://example.org/IBAL#HVACZone_4"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#present-value": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "0.0"
+                "@value": "70.0"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d18 pos c"
+                "@value": "zs4_out_rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_334T",
+        "@id": "http://example.org/IBAL#vav3_heat_c",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#AnalogOutputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://example.org/IBAL#Segment_20"
+                "@value": "VAV3 Heater Control Signal"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://example.org/IBAL#ahu2_t_ra"
+                "@value": "analog-output,1"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "Channel 334T"
+                "@value": "vav3_heat_c"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Jnc18-OCP2",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@value": "analog-output"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@value": "Jnc18-OCP2"
+                "@id": "http://example.org/IBAL#VAV_3"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#present-value": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "0.0"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#d6_pos_c",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d6 pos c"
+                "@value": "vav3 heat c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_112",
+        "@id": "http://example.org/IBAL#Channel_307T",
         "@type": [
             "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_18"
+                "@id": "http://example.org/IBAL#Segment_30"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#zs4_out_rtd"
+                "@id": "http://example.org/IBAL#exf2_t_in"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 112"
+                "@value": "Channel 307T"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc16-OCP2",
+        "@id": "http://example.org/IBAL#WaterPump_4_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc16-OCP2"
+                "@value": "Water pump 4 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_22",
+        "@id": "http://example.org/IBAL#Channel_73",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc22-ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc22-OCP1"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Jnc22-OCP2"
+                "@id": "http://example.org/IBAL#HC_4_ICP"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#ahu1_in_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 22"
+                "@value": "Channel 73"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_1",
+        "@id": "http://example.org/IBAL#VAV_1_Connection_1",
         "@type": [
-            "http://data.ashrae.org/standard223#AirHandlingUnit"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "http://example.org/IBAL#CoolingCoil_1"
-            },
-            {
-                "@id": "http://example.org/IBAL#Fan_1"
-            },
-            {
-                "@id": "http://example.org/IBAL#HeatingCoil_1"
-            },
-            {
-                "@id": "http://example.org/IBAL#VFD_1"
-            }
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#AHU_1_G_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#AHU_1_G_OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#AHU_1_ICP"
-            },
+        "http://data.ashrae.org/standard223#connectsAt": [
             {
-                "@id": "http://example.org/IBAL#AHU_1_OCP"
+                "@id": "http://example.org/IBAL#Damper_1_OCP"
             },
             {
-                "@id": "http://example.org/IBAL#AHU_1_S_ICP"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "AHU 1"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#ahu1_p_down",
-        "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "Static Pressure Measurement Downstream Fan"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
-            {
-                "@value": "analog-input,3"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
-            {
-                "@value": "ahu1_p_down"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
-            {
-                "@value": "analog-input"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
-            {
-                "@id": "http://example.org/IBAL#AHU_2"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "0.0"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://example.org/IBAL#HC_2_ICP"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PA"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 1 P Down"
+                "@value": "VAV 1 Connection 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_89",
+        "@id": "http://example.org/IBAL#Segment_77",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc33-OCP"
+                "@id": "http://example.org/IBAL#Jnc28-OCP1"
             },
             {
-                "@id": "http://example.org/IBAL#ThermalStorage_1_ICP"
+                "@id": "http://example.org/IBAL#Jnc29-ICP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -6961,124 +7241,115 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 89"
+                "@value": "Segment 77"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ThermalStorage_1",
+        "@id": "http://example.org/IBAL#Channel_363AO",
         "@type": [
-            "http://data.ashrae.org/standard223#Equipment"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#ThermalStorage_1_ICP"
-            },
+                "@id": "http://example.org/IBAL#MotorizedDamper_3"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#ThermalStorage_1_OCP"
+                "@id": "http://example.org/IBAL#d17_pos_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ThermalStorage 1"
+                "@value": "Channel 363AO"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_cc_rtd",
+        "@id": "http://example.org/IBAL#Segment_23",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasValue": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "45"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "http://example.org/IBAL#Damper_14_ICP"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://example.org/IBAL#Jnc8-OCP1"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 1 CC RTD"
+                "@value": "Segment 23"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ManualTwoWayValve_5_OCP",
+        "@id": "http://example.org/IBAL#CC_2_Water_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Segment_87"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://example.org/IBAL#AHU_2_G_ICP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Manual two way valve 5 OCP"
+                "@value": "CC 2 Water ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_16",
+        "@id": "http://example.org/IBAL#ahu1_fan_power",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#HVAC_Space_3_OCP"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#Jnc6-ICP1"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/W"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 16"
+                "@value": "AHU1 Fan Power"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#exf1_t_in",
+        "@id": "http://example.org/IBAL#Jnc23-OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "exf1 t in"
+                "@value": "Jnc23-OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_3_ICP",
+        "@id": "http://example.org/IBAL#Damper_17_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -7089,523 +7360,571 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 3 ICP"
+                "@value": "Damper 17 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu2_t_ra",
+        "@id": "http://example.org/IBAL#Damper_6_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://example.org/IBAL#Fan_3_ICP"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_6"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu2 t ra"
+                "@value": "Damper 6 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_75",
+        "@id": "http://example.org/IBAL#Channel_63",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#ElectricMeter"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#AHU_2_Connection_3"
+                "@id": "http://example.org/IBAL#HeatingCoil_2"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#ahu1_cc_rtd"
+                "@id": "http://example.org/IBAL#vav1_heat_power"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 75"
+                "@value": "Channel 63"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc7-OCP1",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_ICP_2",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+            }
+        ],
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Motorized three way valve 2 ICP 2"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Jnc28-OCP2",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc7-OCP1"
+                "@value": "Jnc28-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedDamper_10",
+        "@id": "http://example.org/IBAL#Channel_325T",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Damper_10_ICP"
-            },
+                "@id": "http://example.org/IBAL#Segment_23"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#Damper_10_OCP"
+                "@id": "http://example.org/IBAL#ahu1_t_ra"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized damper 10"
+                "@value": "Channel 325T"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_2_Connection_1",
+        "@id": "http://example.org/IBAL#Channel_394bw",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#connectsAt": [
-            {
-                "@id": "http://example.org/IBAL#Damper_2_OCP"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#HC_3_ICP"
+                "@id": "http://example.org/IBAL#Fan_4"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#exf2_on"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV 2 Connection 1"
+                "@value": "Channel 394bw"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc22-OCP2",
+        "@id": "http://example.org/IBAL#CC_1_Water_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "http://example.org/IBAL#AHU_1_G_ICP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc22-OCP2"
+                "@value": "CC 1 Water ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu2_t_sa",
+        "@id": "http://example.org/IBAL#Segment_68",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://example.org/IBAL#Jnc24-OCP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_ICP_1"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu 2 t sa"
+                "@value": "Segment 68"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#exf2_vfd",
+        "@id": "http://example.org/IBAL#CC_1_Water_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://example.org/IBAL#AHU_1_G_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "exf2 vfd"
+                "@value": " CC 1 Water OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#PlateHeatExchange_2_Upper_ICP",
+        "@id": "http://example.org/IBAL#Jnc24-ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Segment_67"
+            }
+        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Plate Heat Exchange 2 Upper ICP"
+                "@value": "Jnc24-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_73",
+        "@id": "http://example.org/IBAL#VFD_4_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#HC_4_ICP"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#ahu1_in_rtd"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 73"
+                "@value": "VFD 4 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_2",
+        "@id": "http://example.org/IBAL#Damper_8_ICP",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#BACnetDevice",
-            "http://data.ashrae.org/standard223#TerminalUnit"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/bacnet/2020#hasPort": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/bacnet/2020#P_47812"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "http://example.org/IBAL#HeatingCoil_3"
-            },
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_2"
+                "@id": "http://example.org/IBAL#MotorizedDamper_8"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://example.org/IBAL#VAV_2_ICP"
-            },
+                "@value": "Damper 8 ICP"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Jnc17-ICP",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#VAV_2_OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV 2"
+                "@value": "Jnc17-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_307T",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#ThreeWayValve"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#Segment_30"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_ICP_1"
+            },
             {
-                "@id": "http://example.org/IBAL#exf2_t_in"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_ICP_2"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 307T"
+                "@value": "Motorized three way valve 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc1-OCP2",
+        "@id": "http://example.org/IBAL#Jnc22-ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc1-OCP2"
+                "@value": "Jnc22-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_302",
+        "@id": "http://example.org/IBAL#ManualTwoWayValve_4",
         "@type": [
-            "http://data.ashrae.org/standard223#FlowSensor"
+            "http://data.ashrae.org/standard223#TwoWayValve"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#Segment_4"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_4_ICP"
+            },
             {
-                "@id": "http://example.org/IBAL#vav2_f"
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_4_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 302"
+                "@value": "Manual two way valve 4"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_32",
+        "@id": "http://example.org/IBAL#Junction_26",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Damper_7_OCP"
+                "@id": "http://example.org/IBAL#Jnc26-ICP1"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc11-ICP2"
+                "@id": "http://example.org/IBAL#Jnc26-ICP2"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc26-OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 32"
+                "@value": "Junction 26"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav2_heat_c",
+        "@id": "http://example.org/IBAL#VAV_4_Connection_1",
         "@type": [
-            "http://data.ashrae.org/standard223#AnalogOutputObject",
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/bacnet/2020#description": [
+        "http://data.ashrae.org/standard223#connectsAt": [
             {
-                "@value": "VAV1 Heater Control Signal"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
+                "@id": "http://example.org/IBAL#Damper_4_OCP"
+            },
             {
-                "@value": "analog-output,1"
+                "@id": "http://example.org/IBAL#HC_6_ICP"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "vav2_heat_c"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "analog-output"
+                "@value": "VAV 4 Connection 1"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Channel_160",
+        "@type": [
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#VAV_2"
+                "@id": "http://example.org/IBAL#Segment_70"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "0.0"
+                "@id": "http://example.org/IBAL#pl_in_rtd"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@value": "Channel 160"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#HC_3_W_ICP",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav2 heat c"
+                "@value": "HC 3 W ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu2_cc_in_rtd",
+        "@id": "http://example.org/IBAL#MotorizedDamper_11",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "http://example.org/IBAL#Damper_11_ICP"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://example.org/IBAL#Damper_11_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu2 cc in rtd"
+                "@value": "Motorized damper 11"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc33-OCP2",
+        "@id": "http://example.org/IBAL#HC_7_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc33-OCP2"
+                "@value": "HC 7OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_8_ICP",
+        "@id": "http://example.org/IBAL#Junction_6",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#Jnc6-ICP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc6-ICP2"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc6-OCP"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_8"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 8 ICP"
+                "@value": "Junction 6"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc37-ICP",
+        "@id": "http://example.org/IBAL#AHU_1_Zone",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://example.org/IBAL#Segment_99"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomainSpace": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#HVACSpace_1"
+            },
+            {
+                "@id": "http://example.org/IBAL#HVACSpace_2"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc37-ICP"
+                "@value": "AHU 1 Zone"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HeatExchange",
+        "@id": "http://example.org/IBAL#Jnc2-OCP1",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/value": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@value": "60"
+                "@id": "http://example.org/IBAL#Junction_2"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HeatExchange"
+                "@value": "Jnc2-OCP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_3_ICP",
+        "@id": "http://example.org/IBAL#HC_1_E_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "http://example.org/IBAL#VAV_3_ICP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 3 ICP"
+                "@value": "HC 1 E ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ts_out_rtd",
+        "@id": "http://example.org/IBAL#PlateHeatExchanger_1",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#HeatExchanger"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "http://example.org/IBAL#PlateHeatExchange_1_Lower_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#PlateHeatExchange_1_Lower_OCP"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://example.org/IBAL#PlateHeatExchange_1_Upper_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#PlateHeatExchange_1_Upper_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ts out rtd"
+                "@value": "Plate heat exchanger 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_14_ICP",
+        "@id": "http://example.org/IBAL#Damper_15_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -7614,111 +7933,110 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_14"
-            }
-        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 14 ICP"
+                "@value": "Damper 15 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#d8_pos_fb",
+        "@id": "http://example.org/IBAL#Jnc3-ICP1",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d8 pos fb"
+                "@value": "Jnc3-ICP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_98",
+        "@id": "http://example.org/IBAL#Channel_110",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc22-ICP"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Jnc36-OCP2"
+                "@id": "http://example.org/IBAL#Segment_16"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#zs3_out_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 98"
+                "@value": "Channel 110"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#CoolingCoil_3",
+        "@id": "http://example.org/IBAL#d17_pos_c",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
+            "http://data.ashrae.org/bacnet/2020#AnalogOutputObject",
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://example.org/IBAL#CC_3_ICP"
-            },
+                "@value": "VAV3 Damper Control Signal"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://example.org/IBAL#CC_3_OCP"
-            },
+                "@value": "analog-output,2"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@id": "http://example.org/IBAL#CC_3_W_ICP"
-            },
+                "@value": "d17_pos_c"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@id": "http://example.org/IBAL#CC_3_W_OCP"
+                "@value": "analog-output"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@value": "Cooling coil 3"
+                "@id": "http://example.org/IBAL#VAV_3"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Channel_329AO",
-        "@type": [
-            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/bacnet/2020#present-value": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_13"
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "0.0"
             }
         ],
-        "http://data.ashrae.org/standard223#observers": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#d6_pos_c"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 329AO"
+                "@value": "d17 pos c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HVAC_Space_3_OCP",
+        "@id": "http://example.org/IBAL#VAV_4_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_16"
+                "@id": "http://example.org/IBAL#VAV_4_Connection_2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -7728,84 +8046,84 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HVAC Space 3 OCP"
+                "@value": "VAV 4 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_57",
+        "@id": "http://example.org/IBAL#AHU_2_Connection_2",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#connectsAt": [
             {
-                "@id": "http://example.org/IBAL#Jnc18-OCP2"
+                "@id": "http://example.org/IBAL#CC_2_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_1_ICP"
+                "@id": "http://example.org/IBAL#HC_4_OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 57"
+                "@value": "AHU 2 Connection 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_83",
+        "@id": "http://example.org/IBAL#Jnc32-OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#AHU_3_ICP"
+                "@id": "http://example.org/IBAL#Segment_88"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#oau_in_rtd"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 83"
+                "@value": "Jnc32-OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav4_f",
+        "@id": "http://example.org/IBAL#d16_pos_c",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/bacnet/2020#AnalogOutputObject",
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@value": "VAV4 Airflow Rate"
+                "@value": "VAV2 Damper Control Signal"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@value": "analog-input,4"
+                "@value": "analog-output,2"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "VAV4-Airflow"
+                "@value": "d16_pos_c"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@value": "analog-input"
+                "@value": "analog-output"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#VAV_4"
+                "@id": "http://example.org/IBAL#VAV_2"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#present-value": [
@@ -7816,309 +8134,282 @@
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav4 f"
+                "@value": "d16 pos c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_76",
+        "@id": "http://example.org/IBAL#Jnc14-OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc26-OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc28-ICP"
+                "@id": "http://example.org/IBAL#Segment_42"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 76"
+                "@value": "Jnc14-OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_327T",
+        "@id": "http://example.org/IBAL#Fan_4_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#Segment_39"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#ahu2_t_sa"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 327T"
+                "@value": "Fan 4 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VFD_1_OCP",
+        "@id": "http://example.org/IBAL#Fan_2_VFD_2",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Electricity-Signal"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "http://example.org/IBAL#Fan_2_S_ICP"
+            },
             {
-                "@value": "VFD 1 OCP"
+                "@id": "http://example.org/IBAL#VFD_2_OCP"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Jnc15-OCP1",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc15-OCP1"
+                "@value": "Fan 2 VFD 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_37",
+        "@id": "http://example.org/IBAL#zs4_t_sp_f",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://example.org/IBAL#Damper_12_OCP"
-            },
+                "@value": "Zone4 Temperature Setpoint"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://example.org/IBAL#Jnc13-ICP2"
+                "@value": "analog-input,6"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@value": "zs4_t_sp_f"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@value": "Segment 37"
+                "@value": "analog-input"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Segment_60",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#Jnc20-ICP"
-            },
+                "@id": "http://example.org/IBAL#VAV_4"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#present-value": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_OCP"
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "74.0"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Aspect-Setpoint"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "Segment 60"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Jnc27-ICP",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc27-ICP"
+                "@value": "zs4 t sp f"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_3_W_OCP",
+        "@id": "http://example.org/IBAL#Jnc10-ICP1",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 3 W OCP"
+                "@value": "Jnc10-ICP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_1_OCP",
+        "@id": "http://example.org/IBAL#Channel_66",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#ElectricMeter"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#VAV_1_Connection_2"
+                "@id": "http://example.org/IBAL#HeatingCoil_6"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#vav4_heat_power"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV 1 OCP"
+                "@value": "Channel 66"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_73",
+        "@id": "http://example.org/IBAL#VFD_4_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc27-ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#WaterPump_1_OCP"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 73"
+                "@value": "VFD 4 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_121",
+        "@id": "http://example.org/IBAL#d8_pos_fb",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#Segment_76"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#ch1_e_in_rtd"
+                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 121"
+                "@value": "d8 pos fb"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_92",
+        "@id": "http://example.org/IBAL#Segment_24",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc34-ICP"
+                "@id": "http://example.org/IBAL#Damper_8_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_OCP"
+                "@id": "http://example.org/IBAL#Jnc8-OCP2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 92"
+                "@value": "Segment 24"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc10-ICP2",
+        "@id": "http://example.org/IBAL#AHU_1_G_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc10-ICP2"
+                "@value": "AHU 1 G ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_3",
+        "@id": "http://example.org/IBAL#Jnc37-OCP1",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Jnc1-OCP1"
-            },
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://example.org/IBAL#Jnc2-ICP"
+                "@value": "Jnc37-OCP1"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Jnc24-OCP1",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 3"
+                "@value": "Jnc24-OCP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc6-ICP1",
+        "@id": "http://example.org/IBAL#HVAC_Space_3_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -8129,141 +8420,123 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc6-ICP1"
+                "@value": "HVAC Space 3 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc14-ICP2",
+        "@id": "http://example.org/IBAL#v13_pos_c",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc14-ICP2"
+                "@value": "v13 pos c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_7",
+        "@id": "http://example.org/IBAL#Channel_303T",
         "@type": [
-            "http://data.ashrae.org/standard223#HumiditySensor"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#AHU_1_ICP"
+                "@id": "http://example.org/IBAL#Segment_7"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#ahu2_rh_up"
+                "@id": "http://example.org/IBAL#vav3_t_in"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 7"
+                "@value": "Channel 303T"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_2_Connection_2",
+        "@id": "http://example.org/IBAL#Jnc35-OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#connectsAt": [
-            {
-                "@id": "http://example.org/IBAL#CC_2_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#HC_4_OCP"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 2 Connection 2"
+                "@value": "Jnc35-OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HeatingCoil_1",
+        "@id": "http://example.org/IBAL#AHU_2_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#HC_1_E_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#HC_1_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#HC_1_OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#HC_1_W_ICP"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#HC_1_W_OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Heating coil 1"
+                "@value": "AHU 2 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_ICP_2",
+        "@id": "http://example.org/IBAL#d5_pos_c",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 4 ICP 2"
+                "@value": "d5 pos c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_2_Zone",
+        "@id": "http://example.org/IBAL#Channel_405",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://example.org/IBAL#HeatingCoil_1"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomainSpace": [
-            {
-                "@id": "http://example.org/IBAL#HVACSpace_3"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#HVACSpace_4"
+                "@id": "http://example.org/IBAL#ahu2_heat_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 2 Zone"
+                "@value": "Channel 405"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HVAC_Space_1_ICP",
+        "@id": "http://example.org/IBAL#Jnc13-ICP1",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -8274,75 +8547,70 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HVAC Space 1 ICP"
+                "@value": "Jnc13-ICP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_51",
+        "@id": "http://example.org/IBAL#Fan_4_E_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#HumiditySensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#Segment_44"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#oau_rh"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 51"
+                "@value": "Fan 4 E ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc33-ICP2",
+        "@id": "http://example.org/IBAL#Damper_11_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#Segment_39"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Junction_33"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc33-ICP2"
+                "@value": "Damper 11 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#d10_pos_c",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d10 pos c"
+                "@value": "Motorized three way valve 3 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc37-OCP1",
+        "@id": "http://example.org/IBAL#Jnc33-OCP2",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -8353,519 +8621,505 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc37-OCP1"
+                "@value": "Jnc33-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_12",
+        "@id": "http://example.org/IBAL#Channel_121",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc12-ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc12-OCP1"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Jnc12-OCP2"
+                "@id": "http://example.org/IBAL#Segment_76"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#ch1_e_in_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 12"
+                "@value": "Channel 121"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_6_ICP",
+        "@id": "http://example.org/IBAL#Chiller_1_Lower_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 6 ICP"
+                "@value": "Chiller 1 Lower ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#d15_pos_c",
+        "@id": "http://example.org/IBAL#ahu1_cc_out_rtd",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogOutputObject",
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "VAV1 Damper Control Signal"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
-            {
-                "@value": "analog-output,2"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
-            {
-                "@value": "d15_pos_c"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
-            {
-                "@value": "analog-output"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
-            {
-                "@id": "http://example.org/IBAL#VAV_1"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "0.0"
-            }
-        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d15 pos c"
+                "@value": "AHU1 CC Out RTD"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_12_ICP",
+        "@id": "http://example.org/IBAL#HVACZone_1",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#hasDomainSpace": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_12"
+                "@id": "http://example.org/IBAL#HVACSpace_1"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 12 ICP"
+                "@value": "HVACZone 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ManualTwoWayValve_4",
+        "@id": "http://example.org/IBAL#Fan_1_S_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#TwoWayValve"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_4_ICP"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_4_OCP"
+                "@id": "http://data.ashrae.org/standard223#Electricity-Signal"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Manual two way valve 4"
+                "@value": "Fan 1 S ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_336AO",
+        "@id": "http://example.org/IBAL#CC_1_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#VAV_1"
+                "@id": "http://example.org/IBAL#CoolingCoil_1"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#d15_pos_c"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 336AO"
+                "@value": "CC 1 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_74",
+        "@id": "http://example.org/IBAL#HeatExchange_Connection",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#AHU_2_Connection_2"
+                "@id": "http://example.org/IBAL#PlateHeatExchange_2_Lower_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#WaterPump_1_ICP"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#ahu1_heat_rtd"
+                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 74"
+                "@value": "Heat Exchange Connection"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_495",
+        "@id": "http://example.org/IBAL#Segment_69",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_8"
+                "@id": "http://example.org/IBAL#Jnc25-ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_OCP"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#d10_pos_fb"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 495"
+                "@value": "Segment 69"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_26",
+        "@id": "http://example.org/IBAL#Damper_9_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc26-ICP1"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc26-ICP2"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Jnc26-OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#MotorizedDamper_9"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 26"
+                "@value": "Damper 9 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#exf1_vfd",
+        "@id": "http://example.org/IBAL#Fan_4",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Fan"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "http://example.org/IBAL#Fan_4_E_ICP"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://example.org/IBAL#Fan_4_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Fan_4_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "exf1 vfd"
+                "@value": "Fan 4"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_9_ICP",
+        "@id": "http://example.org/IBAL#Jnc28-ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_9"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 9 ICP"
+                "@value": "Jnc28-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_80",
+        "@id": "http://example.org/IBAL#Channel_306T",
         "@type": [
             "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_1"
+                "@id": "http://example.org/IBAL#Segment_27"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#ahu2_out_rtd"
+                "@id": "http://example.org/IBAL#exf1_t_in"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 80"
+                "@value": "Channel 306T"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_101",
+        "@id": "http://example.org/IBAL#ts_out_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc18-ICP"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#Jnc38-OCP"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 101"
+                "@value": "ts out rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_1_S_ICP",
+        "@id": "http://example.org/IBAL#Channel_451",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Electricity-Signal"
+                "@id": "http://example.org/IBAL#VFD_1"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#ahu2_vfd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 1 S ICP"
+                "@value": "Channel 451"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc15-OCP2",
+        "@id": "http://example.org/IBAL#ManualTwoWayValve_1",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#TwoWayValve"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_1_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_1_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc15-OCP2"
+                "@value": "Manual two way valve 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc16-OCP1",
+        "@id": "http://example.org/IBAL#Damper_18_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_18"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc16-OCP1"
+                "@value": "Damper 18 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#zs2_rh",
+        "@id": "http://example.org/IBAL#ahu1_f_ra",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasValue": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "50"
+                "@value": "1000"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+            }
+        ],
+        "http://qudt.org/schema/qudt/value": [
+            {
+                "@value": "1000"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "zs2 rh"
+                "@value": "AHU 1 F RA"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_2_OCP",
+        "@id": "http://example.org/IBAL#ahu1_heat_c",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 2 OCP"
+                "@value": "AHU1 Heat C"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc12-ICP",
+        "@id": "http://example.org/IBAL#Jnc37-ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Segment_99"
+            }
+        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc12-ICP"
+                "@value": "Jnc37-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_159",
+        "@id": "http://example.org/IBAL#Segment_36",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_92"
+                "@id": "http://example.org/IBAL#AHU_1_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc13-OCP"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#pl_out_rtd"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 159"
+                "@value": "Segment 36"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_34",
+        "@id": "http://example.org/IBAL#Junction_8",
         "@type": [
             "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc34-ICP"
+                "@id": "http://example.org/IBAL#Jnc8-ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc34-OCP1"
+                "@id": "http://example.org/IBAL#Jnc8-OCP1"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc34-OCP2"
+                "@id": "http://example.org/IBAL#Jnc8-OCP2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 34"
+                "@value": "Junction 8"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_15_ICP",
+        "@id": "http://example.org/IBAL#zs3_heat_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "66"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "Damper 15 ICP"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Channel_310AO",
-        "@type": [
-            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_14"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/value": [
             {
-                "@id": "http://example.org/IBAL#d5_pos_c"
+                "@value": "66"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 310AO"
+                "@value": "zs3 heat rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc27-OCP2",
+        "@id": "http://example.org/IBAL#Segment_98",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Jnc22-ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc36-OCP2"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -8874,88 +9128,85 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc27-OCP2"
+                "@value": "Segment 98"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HeatingCoil_3",
+        "@id": "http://example.org/IBAL#AHU_2_Connection_3",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#HC_3_E_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#HC_3_ICP"
-            },
+        "http://data.ashrae.org/standard223#connectsAt": [
             {
-                "@id": "http://example.org/IBAL#HC_3_OCP"
+                "@id": "http://example.org/IBAL#CC_2_OCP"
             },
             {
-                "@id": "http://example.org/IBAL#HC_3_W_ICP"
-            },
+                "@id": "http://example.org/IBAL#Fan_2_ICP"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#HC_3_W_OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Heating coil 3"
+                "@value": "AHU 2 Connection 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_14_OCP",
+        "@id": "http://example.org/IBAL#Channel_326",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#FlowSensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#Segment_38"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_14"
+                "@id": "http://example.org/IBAL#ahu1_f_sa"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 14 OCP"
+                "@value": "Channel 326"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_306T",
+        "@id": "http://example.org/IBAL#Jnc30-ICP2",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#Segment_27"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#exf1_t_in"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 306T"
+                "@value": "Jnc30-ICP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc23-ICP",
+        "@id": "http://example.org/IBAL#Junction_28",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_62"
+                "@id": "http://example.org/IBAL#Jnc28-ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc28-OCP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc28-OCP2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -8965,147 +9216,144 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc23-ICP"
+                "@value": "Junction 28"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#exf1_p_down",
+        "@id": "http://example.org/IBAL#Jnc7-OCP1",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PA"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "exf1 p down"
+                "@value": "Jnc7-OCP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VFD_5",
+        "@id": "http://example.org/IBAL#Fan_3_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#VariableFrequencyDrive"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#VFD_5_ICP"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#VFD_5_OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VFD 5"
+                "@value": "Fan 3 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HeatExchange_Connection",
+        "@id": "http://example.org/IBAL#Segment_20",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#PlateHeatExchange_2_Lower_OCP"
+                "@id": "http://example.org/IBAL#Damper_12_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#WaterPump_1_ICP"
+                "@id": "http://example.org/IBAL#Jnc7-OCP1"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Heat Exchange Connection"
+                "@value": "Segment 20"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_19_OCP",
+        "@id": "http://example.org/IBAL#Channel_395bw",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#AHU_3"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_19"
+                "@id": "http://example.org/IBAL#ahu1_on"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 19 OCP"
+                "@value": "Channel 395bw"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ManualTwoWayValve_3",
+        "@id": "http://example.org/IBAL#d18_pos_c",
         "@type": [
-            "http://data.ashrae.org/standard223#TwoWayValve"
+            "http://data.ashrae.org/bacnet/2020#AnalogOutputObject",
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_3_ICP"
-            },
+                "@value": "VAV4 Damper Control Signal"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_3_OCP"
+                "@value": "analog-output,2"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "Manual two way valve 3"
+                "@value": "d18_pos_c"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-type": [
+            {
+                "@value": "analog-output"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
+            {
+                "@id": "http://example.org/IBAL#VAV_4"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#present-value": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "0.0"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Damper_5_ICP",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_5"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 5 ICP"
+                "@value": "d18 pos c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Exhaust_Fan_2_Connection_2",
+        "@id": "http://example.org/IBAL#Jnc13-ICP2",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#connectsAt": [
-            {
-                "@id": "http://example.org/IBAL#Damper_9_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Fan_4_OCP"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -9114,22 +9362,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Exhaust Fan 2 Connection 2"
+                "@value": "Jnc13-ICP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_70",
+        "@id": "http://example.org/IBAL#Jnc31-OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc25-OCP1"
-            },
-            {
-                "@id": "http://example.org/IBAL#PlateHeatExchange_2_Lower_ICP"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -9138,21 +9378,15 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 70"
+                "@value": "Jnc31-OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#oau_cc_rtd",
+        "@id": "http://example.org/IBAL#exf2_t_in",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasValue": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "45"
-            }
-        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
                 "@id": "http://qudt.org/vocab/quantitykind/Temperature"
@@ -9165,25 +9399,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "oau cc rtd"
+                "@value": "exf2 t in"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_13",
+        "@id": "http://example.org/IBAL#Jnc1-ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc13-ICP1"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc13-ICP2"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc13-OCP"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -9192,175 +9415,157 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 13"
+                "@value": "Jnc1-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HeatingCoil_4",
+        "@id": "http://example.org/IBAL#oau_out_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#HC_4_E_ICP"
-            },
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@id": "http://example.org/IBAL#HC_4_ICP"
-            },
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "45"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#HC_4_OCP"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#HC_4_W_ICP"
-            },
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
+            }
+        ],
+        "http://qudt.org/schema/qudt/value": [
             {
-                "@id": "http://example.org/IBAL#HC_4_W_OCP"
+                "@value": "45"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Heating coil 4"
+                "@value": "oau out rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_51",
+        "@id": "http://example.org/IBAL#Segment_61",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Damper_19_OCP"
+                "@id": "http://example.org/IBAL#Jnc20-OCP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc17-ICP"
+                "@id": "http://example.org/IBAL#Jnc21-ICP1"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 51"
+                "@value": "Segment 61"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_1_E_ICP",
+        "@id": "http://example.org/IBAL#AHU_2_G_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Segment_56"
+            }
+        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 1 E ICP"
+                "@value": "AHU 2 G ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Chiller_2_Lower_Connection",
+        "@id": "http://example.org/IBAL#AHU_2_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#connectsAt": [
-            {
-                "@id": "http://example.org/IBAL#Chiller_2_Lower_OCP"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#WaterPump_3_ICP"
+                "@id": "http://example.org/IBAL#Segment_42"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Chiller 2 Lower Connection"
+                "@value": "AHU 2 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedDamper_4",
+        "@id": "http://example.org/IBAL#Segment_73",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
-        ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
-            {
-                "@id": "http://example.org/IBAL#d18_pos_c"
-            }
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Damper_4_ICP"
+                "@id": "http://example.org/IBAL#Jnc27-ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Damper_4_OCP"
+                "@id": "http://example.org/IBAL#WaterPump_1_OCP"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "IBAL:VAV4_ICP"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized damper 4"
+                "@value": "Segment 73"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_f_ra",
+        "@id": "http://example.org/IBAL#Channel_18",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasValue": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "1000"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#ElectricMeter"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://example.org/IBAL#VFD_3"
             }
         ],
-        "http://qudt.org/schema/qudt/value": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@value": "1000"
+                "@id": "http://example.org/IBAL#exf1_power"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 1 F RA"
+                "@value": "Channel 18"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_1_Connection_1",
+        "@id": "http://example.org/IBAL#Jnc15-OCP2",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#connectsAt": [
-            {
-                "@id": "http://example.org/IBAL#Damper_1_OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#HC_2_ICP"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -9369,219 +9574,211 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV 1 Connection 1"
+                "@value": "Jnc15-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_5_OCP",
+        "@id": "http://example.org/IBAL#Channel_381",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_5"
+                "@id": "http://example.org/IBAL#v8_pos_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 5 OCP"
+                "@value": "Channel 381"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_77",
+        "@id": "http://example.org/IBAL#Jnc8-ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc28-OCP1"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc29-ICP"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 77"
+                "@value": "Jnc8-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VFD_3",
+        "@id": "http://example.org/IBAL#ch1_f_e",
         "@type": [
-            "http://data.ashrae.org/standard223#VariableFrequencyDrive"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#VFD_3_ICP"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#VFD_3_OCP"
+                "@id": "http://qudt.org/vocab/unit/GAL_US-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VFD 3"
+                "@value": "ch1 f e"
             }
         ]
     },
-    {
-        "@id": "http://example.org/IBAL#Junction_5",
-        "@type": [
-            "http://data.ashrae.org/standard223#Junction"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc5-ICP1"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc5-ICP2"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc5-OCP"
-            }
+    {
+        "@id": "http://example.org/IBAL#Enclosure_1",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#HVACSpace_1"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 5"
+                "@value": "Enclosure 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#PlateHeatExchange_1_Lower_ICP",
+        "@id": "http://example.org/IBAL#Jnc18-OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Plate Heat Exchange 1 Lower ICP"
+                "@value": "Jnc18-OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#PlateHeatExchange_1_Upper_OCP",
+        "@id": "http://example.org/IBAL#vav1_heat_power",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/W"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Plate Heat Exchange 1 Upper OCP"
+                "@value": "vav1 heat power"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_40",
+        "@id": "http://example.org/IBAL#Channel_302",
         "@type": [
-            "http://data.ashrae.org/standard223#HumiditySensor"
+            "http://data.ashrae.org/standard223#FlowSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_18"
+                "@id": "http://example.org/IBAL#Segment_4"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#zs4_rh"
+                "@id": "http://example.org/IBAL#vav2_f"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 40"
+                "@value": "Channel 302"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#WaterChiller_2",
+        "@id": "http://example.org/IBAL#ManualTwoWayValve_5_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Chiller"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#Chiller_2_Lower_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Chiller_2_Lower_OCP"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Chiller_2_Upper_ICP"
-            },
+                "@id": "http://example.org/IBAL#Segment_87"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Chiller_2_Upper_OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Water Chiller 2"
+                "@value": "Manual two way valve 5 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#WaterPump_4_OCP",
+        "@id": "http://example.org/IBAL#Segment_75",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Jnc26-ICP2"
+            },
+            {
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_4_OCP"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Water pump 4 OCP"
+                "@value": "Segment 75"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#d16_pos_c",
+        "@id": "http://example.org/IBAL#vav2_t_in",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogOutputObject",
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@value": "VAV2 Damper Control Signal"
+                "@value": "VAV2 Supply Air Temperature"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@value": "analog-output,2"
+                "@value": "analog-input,3"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "d16_pos_c"
+                "@value": "vav2_t_in"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@value": "analog-output"
+                "@value": "analog-input"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#objectOf": [
@@ -9592,328 +9789,412 @@
         "http://data.ashrae.org/bacnet/2020#present-value": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "0.0"
+                "@value": "70.0"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d16 pos c"
+                "@value": "vav2 t in"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu2_f_cc_mag",
+        "@id": "http://example.org/IBAL#Segment_12",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://example.org/IBAL#HVAC_Space_1_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc5-ICP1"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/GAL_US-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu2 f cc mag"
+                "@value": "Segment 12"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Chiller_1_Upper_OCP",
+        "@id": "http://example.org/IBAL#HC_5_E_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Chiller 1 Upper OCP"
+                "@value": "HC 5 E ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#exf2_p_down",
+        "@id": "http://example.org/IBAL#VAV_2_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PA"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "exf2 p down"
+                "@value": "VAV 2 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_5_W_ICP",
+        "@id": "http://example.org/IBAL#Chiller_1_Lower_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 5 W ICP"
+                "@value": "Chiller 1 Lower OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_18",
+        "@id": "http://example.org/IBAL#Segment_83",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#HVAC_Space_4_OCP"
+                "@id": "http://example.org/IBAL#Jnc31-ICP2"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc6-ICP2"
+                "@id": "http://example.org/IBAL#WaterPump_2_OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 18"
+                "@value": "Segment 83"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_3_E_ICP",
+        "@id": "http://example.org/IBAL#PlateHeatExchange_1_Upper_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 3 E ICP"
+                "@value": "Plate Heat Exchange 1 Upper ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ManualTwoWayValve_4_ICP",
+        "@id": "http://example.org/IBAL#Jnc6-ICP2",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Manual two way valve 4 ICP"
+                "@value": "Jnc6-ICP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_1_Connection_2",
+        "@id": "http://example.org/IBAL#VFD_2_OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "VFD 2 OCP"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#HC-5-OutletFlow",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasValue": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "20"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+            }
+        ],
+        "http://qudt.org/schema/qudt/value": [
+            {
+                "@value": "20"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "HC 5 OutletFlow"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Segment_10",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#HVAC_Space_1_ICP"
+                "@id": "http://example.org/IBAL#Jnc4-OCP2"
             },
             {
-                "@id": "http://example.org/IBAL#VAV_1_OCP"
+                "@id": "http://example.org/IBAL#VAV_4_ICP"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Segment 10"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#HC-1-InletTemp",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasValue": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "40"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/value": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@value": "40"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV 1 Connection 2"
+                "@value": "HC 1 InletTemp"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ManualTwoWayValve_5_ICP",
+        "@id": "http://example.org/IBAL#PlateHetExchange_1_Bypass_Connection",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#connectsAt": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_3_OCP"
+            },
             {
-                "@value": "Manual two way valve 5 ICP"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_ICP_2"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#WaterPump_4_ICP",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Water pump 4 ICP"
+                "@value": "Plate Heat Exchange 1 Bypass Connection"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc27-OCP1",
+        "@id": "http://example.org/IBAL#Jnc12-OCP2",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Segment_39"
+            }
+        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc27-OCP1"
+                "@value": "Jnc12-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc31-OCP",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#ThreeWayValve"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_ICP_1"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_ICP_2"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc31-OCP"
+                "@value": "Motorized three way valve 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_36",
+        "@id": "http://example.org/IBAL#ahu1_p_down",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#AHU_1_ICP"
-            },
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://example.org/IBAL#Jnc13-OCP"
+                "@value": "Static Pressure Measurement Downstream Fan"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@value": "analog-input,3"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "Segment 36"
+                "@value": "ahu1_p_down"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Channel_108",
-        "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@id": "http://example.org/IBAL#Segment_14"
+                "@value": "analog-input"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#zs2_out_rtd"
+                "@id": "http://example.org/IBAL#AHU_2"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#present-value": [
             {
-                "@value": "Channel 108"
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "0.0"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#WaterPump_2",
-        "@type": [
-            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#WaterPump_2_ICP"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#WaterPump_2_OCP"
+                "@id": "http://qudt.org/vocab/unit/PA"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Water pump 2"
+                "@value": "AHU 1 P Down"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc33-ICP1",
+        "@id": "http://example.org/IBAL#Segment_26",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Damper_10_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc9-OCP"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc33-ICP1"
+                "@value": "Segment 26"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_76temp",
+        "@id": "http://example.org/IBAL#ahu1_t_ra",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
+        "http://data.ashrae.org/standard223#hasValue": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "65"
+            }
+        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
                 "@id": "http://qudt.org/vocab/quantitykind/Temperature"
@@ -9924,180 +10205,169 @@
                 "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
-        "http://qudt.org/schema/qudt/value": [
-            {
-                "@value": "75"
-            }
-        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 76temp"
+                "@value": "AHU 1 T RA"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc32-OCP",
+        "@id": "http://example.org/IBAL#Damper_16_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Segment_88"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#MotorizedDamper_16"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc32-OCP"
+                "@value": "Damper 16 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ManualTwoWayValve_1",
+        "@id": "http://example.org/IBAL#Jnc8-OCP2",
         "@type": [
-            "http://data.ashrae.org/standard223#TwoWayValve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_1_ICP"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_1_OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Manual two way valve 1"
+                "@value": "Jnc8-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_454",
+        "@id": "http://example.org/IBAL#Segment_33",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#VFD_4"
+                "@id": "http://example.org/IBAL#Damper_9_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc11-ICP1"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#exf2_vfd"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 454"
+                "@value": "Segment 33"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_28",
+        "@id": "http://example.org/IBAL#Segment_42",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Jnc28-ICP"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#lnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc28-OCP1"
-            },
+                "@id": "http://example.org/IBAL#HC_4_ICP"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://example.org/IBAL#Jnc28-OCP2"
+                "@value": "Segment 42"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL",
+        "@type": [
+            "http://www.w3.org/2002/07/owl#Ontology"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://www.w3.org/2002/07/owl#imports": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223/1.0/model/all"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2002/07/owl#versionInfo": [
             {
-                "@value": "Junction 28"
+                "@value": "Created with TopBraid Composer"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav1_heat_power",
+        "@id": "http://example.org/IBAL#d10_pos_c",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/W"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav1 heat power"
+                "@value": "d10 pos c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_10",
+        "@id": "http://example.org/IBAL#Junction_37",
         "@type": [
             "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc10-ICP1"
+                "@id": "http://example.org/IBAL#Jnc37-ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc10-ICP2"
+                "@id": "http://example.org/IBAL#Jnc37-OCP1"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc10-OCP"
+                "@id": "http://example.org/IBAL#Jnc37-OCP2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Junction 10"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#d7_pos_fb",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d7 pos fb"
+                "@value": "Junction 37"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_84",
+        "@id": "http://example.org/IBAL#Segment_94",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc30-OCP"
+                "@id": "http://example.org/IBAL#Jnc34-OCP2"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc31-ICP1"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_ICP_2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -10107,28 +10377,28 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 84"
+                "@value": "Segment 94"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL",
+        "@id": "http://example.org/IBAL#Jnc19-OCP2",
         "@type": [
-            "http://www.w3.org/2002/07/owl#Ontology"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://www.w3.org/2002/07/owl#imports": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223/1.0/model/all"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
-        "http://www.w3.org/2002/07/owl#versionInfo": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Created with TopBraid Composer"
+                "@value": "Jnc19-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_7_W_ICP",
+        "@id": "http://example.org/IBAL#Jnc5-ICP2",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -10139,154 +10409,160 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 7 W ICP"
+                "@value": "Jnc5-ICP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_43",
+        "@id": "http://example.org/IBAL#ahu2_cc_in_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Damper_15_OCP"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#Jnc12-ICP"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 43"
+                "@value": "ahu2 cc in rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_45",
+        "@id": "http://example.org/IBAL#ManualTwoWayValve_4_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Damper_15_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc15-OCP1"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 45"
+                "@value": "Manual two way valve 4 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Enclosure_3",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_ICP_2",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#HVACSpace_3"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Enclosure 3"
+                "@value": "Motorized three way valve 5 ICP 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc2-OCP2",
+        "@id": "http://example.org/IBAL#Channel_50",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#PressureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#Segment_44"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#oau_p_down"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc2-OCP2"
+                "@value": "Channel 50"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV3_FnB",
+        "@id": "http://example.org/IBAL#Junction_7",
         "@type": [
-            "http://data.ashrae.org/standard223#FunctionBlock"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#hasInput": [
-            {
-                "@id": "http://example.org/IBAL#d17_pos_fb"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#vav3_f"
+                "@id": "http://example.org/IBAL#Jnc7-ICP"
             },
             {
-                "@id": "http://example.org/IBAL#vav3_out_rtd"
+                "@id": "http://example.org/IBAL#Jnc7-OCP1"
             },
             {
-                "@id": "http://example.org/IBAL#vav3_t_in"
-            },
+                "@id": "http://example.org/IBAL#Jnc7-OCP2"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#zs3_out_rtd"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://example.org/IBAL#zs3_t_sp_f"
+                "@value": "Junction 7"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#WaterPump_3",
+        "@type": [
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://data.ashrae.org/standard223#hasOutput": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#d17_pos_c"
+                "@id": "http://example.org/IBAL#WaterPump_3_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#vav3_heat_c"
+                "@id": "http://example.org/IBAL#WaterPump_3_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV3 Fn b"
+                "@value": "Water pump 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_86",
+        "@id": "http://example.org/IBAL#Channel_401",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#Controller"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_44"
+                "@id": "http://example.org/IBAL#HeatingCoil_2"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#oau_out_rtd"
+                "@id": "http://example.org/IBAL#vav1_heat_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 86"
+                "@value": "Channel 401"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc8-OCP1",
+        "@id": "http://example.org/IBAL#Jnc14-ICP2",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -10295,43 +10571,46 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc8-OCP1"
+                "@value": "Jnc14-ICP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu2_heat_power",
+        "@id": "http://example.org/IBAL#Jnc21-ICP2",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/W"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu2 heat power"
+                "@value": "Jnc21-ICP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_2_Connection_3",
+        "@id": "http://example.org/IBAL#Jnc20-OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#connectsAt": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#CC_2_OCP"
-            },
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://example.org/IBAL#Fan_2_ICP"
+                "@value": "Jnc20-OCP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#AHU_1_OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -10340,28 +10619,33 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 2 Connection 3"
+                "@value": "AHU 1 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#d7_pos_c",
+        "@id": "http://example.org/IBAL#vav2_heat_power",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/W"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d7 pos c"
+                "@value": "vav2 heat power"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#d5_pos_fb",
+        "@id": "http://example.org/IBAL#d7_pos_c",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -10372,21 +10656,21 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d5 pos fb"
+                "@value": "d7 pos c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_1_Connection_3",
+        "@id": "http://example.org/IBAL#Segment_49",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#connectsAt": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#CC_1_OCP"
+                "@id": "http://example.org/IBAL#Damper_18_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Fan_1_ICP"
+                "@id": "http://example.org/IBAL#Jnc16-OCP2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -10396,48 +10680,69 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 1 Connection 3"
+                "@value": "Segment 49"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_38",
+        "@id": "http://example.org/IBAL#Channel_301T",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Jnc38-ICP"
-            },
+                "@id": "http://example.org/IBAL#Segment_1"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#Jnc38-OCP"
+                "@id": "http://example.org/IBAL#vav1_t_in"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Channel 301T"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#AHU_1_Connection_3",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#connectsAt": [
+            {
+                "@id": "http://example.org/IBAL#CC_1_OCP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc38-OCP2"
+                "@id": "http://example.org/IBAL#Fan_1_ICP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 38"
+                "@value": "AHU 1 Connection 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_85",
+        "@id": "http://example.org/IBAL#Junction_25",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc31-OCP"
+                "@id": "http://example.org/IBAL#Jnc25-ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc32-ICP2"
+                "@id": "http://example.org/IBAL#Jnc25-OCP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc25-OCP2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -10447,51 +10752,75 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 85"
+                "@value": "Junction 25"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_4_ICP",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_ICP_1",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Segment_106"
+            }
+        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://example.org/IBAL#VAV_4_ICP"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 4 ICP"
+                "@value": "Motorized three way valve 2 ICP 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_4_W_OCP",
+        "@id": "http://example.org/IBAL#Junction_34",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Junction"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Jnc34-ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc34-OCP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc34-OCP2"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 4 W OCP"
+                "@value": "Junction 34"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_17_ICP",
+        "@id": "http://example.org/IBAL#Segment_21",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Damper_6_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc7-OCP2"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -10500,59 +10829,33 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 17 ICP"
+                "@value": "Segment 21"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_2",
+        "@id": "http://example.org/IBAL#ahu2_rh_down",
         "@type": [
-            "http://data.ashrae.org/standard223#AirHandlingUnit"
-        ],
-        "http://data.ashrae.org/bacnet/2020#hasPort": [
-            {
-                "@id": "http://data.ashrae.org/bacnet/2020#P_47815"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "http://example.org/IBAL#CoolingCoil_2"
-            },
-            {
-                "@id": "http://example.org/IBAL#Fan_2"
-            },
-            {
-                "@id": "http://example.org/IBAL#HeatingCoil_4"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#VFD_2"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#AHU_2_G_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#AHU_2_G_OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#AHU_2_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#AHU_2_OCP"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#AHU_2_S_ICP"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 2"
+                "@value": "ahu2 rh down"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_4_ICP",
+        "@id": "http://example.org/IBAL#Jnc11-ICP2",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -10563,330 +10866,364 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV 4 ICP"
+                "@value": "Jnc11-ICP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav4_heat_power",
+        "@id": "http://example.org/IBAL#pl_out_rtd",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/W"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav4 heat power"
+                "@value": "pl out rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_122",
+        "@id": "http://example.org/IBAL#Channel_197",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#FlowSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Chiller_1_Lower_Connection"
+                "@id": "http://example.org/IBAL#Segment_105"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#ch1_e_out_rtd"
+                "@id": "http://example.org/IBAL#ahu1_f_cc"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 122"
+                "@value": "Channel 197"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HVAC_Space_4_OCP",
+        "@id": "http://example.org/IBAL#zs1_heat_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@id": "http://example.org/IBAL#Segment_18"
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "66"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
+            }
+        ],
+        "http://qudt.org/schema/qudt/value": [
+            {
+                "@value": "66"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HVAC Space 4 OCP"
+                "@value": "zs1 heat rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc25-OCP1",
+        "@id": "http://example.org/IBAL#Jnc1-OCP1",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc25-OCP1"
+                "@value": "Jnc1-OCP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc7-ICP",
+        "@id": "http://example.org/IBAL#Channel_105",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#HVAC_Space_1_ICP"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#zs1_heat_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc7-ICP"
+                "@value": "Channel 105"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_9",
+        "@id": "http://example.org/IBAL#Junction_36",
         "@type": [
             "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc9-ICP"
+                "@id": "http://example.org/IBAL#Jnc36-ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc9-OCP"
+                "@id": "http://example.org/IBAL#Jnc36-OCP1"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc9-OCP2"
+                "@id": "http://example.org/IBAL#Jnc36-OCP2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 9"
+                "@value": "Junction 36"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_105",
+        "@id": "http://example.org/IBAL#Segment_48",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#HVAC_Space_1_ICP"
+                "@id": "http://example.org/IBAL#Damper_17_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc16-OCP1"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#zs1_heat_rtd"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 105"
+                "@value": "Segment 48"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_39",
+        "@id": "http://example.org/IBAL#Segment_90",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Jnc33-OCP2"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_ICP_2"
+            }
+        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 39"
+                "@value": "Segment 90"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav2_heat_power",
+        "@id": "http://example.org/IBAL#Segment_62",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://example.org/IBAL#Jnc21-OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc23-ICP"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/W"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav2 heat power"
+                "@value": "Segment 62"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_t_sa",
+        "@id": "http://example.org/IBAL#d7_pos_fb",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasValue": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "60"
+                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "d7 pos fb"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#ahu2_f_cc_mag",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://qudt.org/vocab/unit/GAL_US-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 1 T SA"
+                "@value": "ahu2 f cc mag"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_310",
+        "@id": "http://example.org/IBAL#Damper_9_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_14"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://example.org/IBAL#d5_pos_fb"
+                "@id": "http://example.org/IBAL#MotorizedDamper_9"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 310"
+                "@value": "Damper 9 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_87",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_ICP_1",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#VAV_1_Connection_2"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://example.org/IBAL#vav1_out_rtd"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 87"
+                "@value": "Motorized three way valve 4 ICP 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_193",
+        "@id": "http://example.org/IBAL#Segment_76temp",
         "@type": [
-            "http://data.ashrae.org/standard223#FlowSensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#Chiller_1_Lower_Connection"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#ch1_f_e"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
+            }
+        ],
+        "http://qudt.org/schema/qudt/value": [
+            {
+                "@value": "75"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 193"
+                "@value": "Segment 76temp"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_2",
+        "@id": "http://example.org/IBAL#AHU_1_S_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc2-ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc2-OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc2-OCP2"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Electricity-Signal"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 2"
+                "@value": "AHU 1 S ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_16",
+        "@id": "http://example.org/IBAL#Channel_383",
         "@type": [
-            "http://data.ashrae.org/standard223#PressureSensor"
+            "http://data.ashrae.org/standard223#Controller"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_30"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#exf2_p_up"
+                "@id": "http://example.org/IBAL#v12_pos_fb"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 16"
+                "@value": "Channel 383"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_9_OCP",
+        "@id": "http://example.org/IBAL#Fan_4_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -10895,123 +11232,111 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_9"
-            }
-        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 9 OCP"
+                "@value": "Fan 4 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_6_ICP",
+        "@id": "http://example.org/IBAL#Segment_104",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#connectsAt": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_ICP_1"
+            },
+            {
+                "@id": "http://example.org/IBAL#ThermalStorage_1_OCP"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_6"
+                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 6 ICP"
+                "@value": "Segment 104"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#CoolingCoil_1",
+        "@id": "http://example.org/IBAL#ManualTwoWayValve_3_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#CC_1_Water_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#CC_1_Water_OCP"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Cooling coil 1"
+                "@value": "Manual two way valve 3 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HVACSpace_4",
+        "@id": "http://example.org/IBAL#Jnc27-ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#HVAC_Space_4_ICP"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#HVAC_Space_4_OCP"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@value": "Jnc27-ICP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#HC_2_ICP",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#zs4_t_sp_f"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HVACSpace 4"
+                "@value": "HC 2 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#exf1_on",
+        "@id": "http://example.org/IBAL#HC_4_E_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "exf1 on"
+                "@value": "HC 4 E ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_25",
+        "@id": "http://example.org/IBAL#Segment_51",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Damper_6_OCP"
+                "@id": "http://example.org/IBAL#Damper_19_OCP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc9-ICP"
+                "@id": "http://example.org/IBAL#Jnc17-ICP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -11021,223 +11346,216 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 25"
+                "@value": "Segment 51"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_426",
+        "@id": "http://example.org/IBAL#WaterPump_4_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_6"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#d11_pos_c"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 426"
+                "@value": "Water pump 4 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_88",
+        "@id": "http://example.org/IBAL#WaterPump_1",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#VAV_2_Connection_2"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "http://example.org/IBAL#WaterPump_1_ICP"
+            },
             {
-                "@id": "http://example.org/IBAL#vav2_out_rtd"
+                "@id": "http://example.org/IBAL#WaterPump_1_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 88"
+                "@value": "Water pump 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#CC_1_Bypass_Connection",
+        "@id": "http://example.org/IBAL#AHU1_FnB",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#FunctionBlock"
         ],
-        "http://data.ashrae.org/standard223#connectsAt": [
+        "http://data.ashrae.org/standard223#hasInput": [
             {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_2_OCP"
+                "@id": "http://example.org/IBAL#ahu2_out_rtd"
             },
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_ICP_2"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "http://example.org/IBAL#ahu2_p_down"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "http://example.org/IBAL#d15_pos_c"
+            },
             {
-                "@value": "CC 1 Bypass Connection"
+                "@id": "http://example.org/IBAL#d16_pos_c"
+            },
+            {
+                "@id": "http://example.org/IBAL#v13_pos_fb"
+            },
+            {
+                "@id": "http://example.org/IBAL#vav1_heat_c"
+            },
+            {
+                "@id": "http://example.org/IBAL#vav2_heat_c"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#HC_5_E_ICP",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasOutput": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://example.org/IBAL#ahu2_vfd"
+            },
+            {
+                "@id": "http://example.org/IBAL#v13_pos_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 5 E ICP"
+                "@value": "AHU1 Fn b"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav2_t_in",
+        "@id": "http://example.org/IBAL#Channel_360",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "VAV2 Supply Air Temperature"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
-            {
-                "@value": "analog-input,3"
-            }
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "vav2_t_in"
+                "@id": "http://example.org/IBAL#MotorizedDamper_2"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@value": "analog-input"
+                "@id": "http://example.org/IBAL#d16_pos_fb"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://example.org/IBAL#VAV_2"
+                "@value": "Channel 360"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#PlateHeatExchange_2_Lower_OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "70.0"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@value": "Plate Heat Exchange 2 Lower OCP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#WaterPump_4",
+        "@type": [
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://example.org/IBAL#WaterPump_4_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#WaterPump_4_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav2 t in"
+                "@value": "Water pump 4"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_3_Connection_3",
+        "@id": "http://example.org/IBAL#Segment_63",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#connectsAt": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Fan_5_ICP"
+                "@id": "http://example.org/IBAL#Jnc22-OCP1"
             },
             {
-                "@id": "http://example.org/IBAL#HC_7_OCP"
+                "@id": "http://example.org/IBAL#PlateHeatExchange_1_Lower_ICP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 3 Connection 3"
+                "@value": "Segment 63"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_50",
+        "@id": "http://example.org/IBAL#MotorizedDamper_10",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#Damper_18_OCP"
+                "@id": "http://example.org/IBAL#Damper_10_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc17-ICP2"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#Damper_10_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 50"
+                "@value": "Motorized damper 10"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_303",
+        "@id": "http://example.org/IBAL#ts_in_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#FlowSensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#Segment_7"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#vav3_f"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 303"
+                "@value": "ts in rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_out_rtd",
+        "@id": "http://example.org/IBAL#vav4_out_rtd",
         "@type": [
             "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@value": "AHU1 Supply Air Temperature"
+                "@value": "VAV4 Discharge Temperature"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-identifier": [
@@ -11247,7 +11565,7 @@
         ],
         "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "ahu1_out_rtd"
+                "@value": "vav4_out_rtd"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-type": [
@@ -11257,7 +11575,7 @@
         ],
         "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#AHU_2"
+                "@id": "http://example.org/IBAL#VAV_4"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#present-value": [
@@ -11278,109 +11596,72 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 1 Out RTD"
+                "@value": "vav4 out rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_160",
+        "@id": "http://example.org/IBAL#Channel_122",
         "@type": [
             "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_70"
+                "@id": "http://example.org/IBAL#Chiller_1_Lower_Connection"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#pl_in_rtd"
+                "@id": "http://example.org/IBAL#ch1_e_out_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 160"
+                "@value": "Channel 122"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_85",
+        "@id": "http://example.org/IBAL#d8_pos_c",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#AHU_3_Connection_3"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#oau_hs_rtd"
+                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 85"
+                "@value": "d8 pos c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_123",
+        "@id": "http://example.org/IBAL#Channel_308",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#FlowSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Chiller_2_Lower_Connection"
+                "@id": "http://example.org/IBAL#Segment_10"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#ch2_e_out_rtd"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Channel 123"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Segment_29",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Damper_10_OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc10-ICP2"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#vav4_f"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 29"
+                "@value": "Channel 308"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_102",
+        "@id": "http://example.org/IBAL#Jnc25-ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc19-ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc37-OCP2"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -11389,320 +11670,254 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 102"
+                "@value": "Jnc25-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_5",
+        "@id": "http://example.org/IBAL#Channel_310",
         "@type": [
-            "http://data.ashrae.org/standard223#PressureSensor"
+            "http://data.ashrae.org/standard223#Controller"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_9"
+                "@id": "http://example.org/IBAL#MotorizedDamper_14"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#ahu1_p_down"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Channel 5"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#HC_4_ICP",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "http://example.org/IBAL#AHU_2_ICP"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "HC 4 ICP"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Jnc13-ICP1",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Jnc13-ICP1"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#HeatingCoil_2",
-        "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#HC_2_E_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#HC_2_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#HC_2_OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#HC_2_W_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#HC_2_W_OCP"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Heating coil 2"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#CC_2_Water_ICP",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "http://example.org/IBAL#AHU_2_G_ICP"
+                "@id": "http://example.org/IBAL#d5_pos_fb"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "CC 2 Water ICP"
+                "@value": "Channel 310"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#zs3_heat_rtd",
+        "@id": "http://example.org/IBAL#Jnc23-ICP2",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasValue": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "66"
+                "@id": "http://example.org/IBAL#Segment_107"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@value": "Jnc23-ICP2"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Jnc5-OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/value": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "66"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "zs3 heat rtd"
+                "@value": "Jnc5-OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc38-ICP",
+        "@id": "http://example.org/IBAL#Fan_3_VFD_3",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_100"
+                "@id": "http://example.org/IBAL#Fan_3_E_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#VFD_3_OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc38-ICP"
+                "@value": "Fan 3 VFD 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_6",
+        "@id": "http://example.org/IBAL#Channel_425",
         "@type": [
-            "http://data.ashrae.org/standard223#HumiditySensor"
+            "http://data.ashrae.org/standard223#Controller"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_9"
+                "@id": "http://example.org/IBAL#MotorizedDamper_8"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#ahu1_rh_down"
+                "@id": "http://example.org/IBAL#d10_pos_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 6"
+                "@value": "Channel 425"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_63",
+        "@id": "http://example.org/IBAL#Fan_5_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#ElectricMeter"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#HeatingCoil_2"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://example.org/IBAL#vav1_heat_power"
+                "@id": "http://example.org/IBAL#AHU_3_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 63"
+                "@value": "Fan 5 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_vfd",
+        "@id": "http://example.org/IBAL#Jnc36-ICP",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogOutputObject",
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/bacnet/2020#description": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "AHU1 Fan Speed"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "analog-output,1"
+                "@value": "Jnc36-ICP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#ManualTwoWayValve_1_ICP",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "ahu1_vfd"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "analog-output"
+                "@value": "Manual two way valve 1 ICP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#HeatingCoil_4",
+        "@type": [
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#AHU_2"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+                "@id": "http://example.org/IBAL#HC_4_E_ICP"
+            },
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "30.0"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "http://example.org/IBAL#HC_4_ICP"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "http://example.org/IBAL#HC_4_OCP"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://example.org/IBAL#HC_4_W_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_4_W_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu1 vfd"
+                "@value": "Heating coil 4"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#v13_pos_fb",
+        "@id": "http://example.org/IBAL#Damper_15_OCP",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "AHU2 Cooling Coil Feedback Signal"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "analog-input,2"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@value": "v13_pos_fb"
+                "@id": "http://example.org/IBAL#MotorizedDamper_15"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "analog-input"
+                "@value": "Damper 15 OCP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#VFD_1_ICP",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#AHU_1"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "0.0"
+                "@value": "VFD 1 ICP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#ahu2_cc_rtd",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "v13 pos fb"
+                "@value": "ahu2 cc rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#WaterPump_3_OCP",
+        "@id": "http://example.org/IBAL#ManualTwoWayValve_1_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -11713,167 +11928,153 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Water pump 3 OCP"
+                "@value": "Manual two way valve 1 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_10",
+        "@id": "http://example.org/IBAL#ahu1_heat_power",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc4-OCP2"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#VAV_4_ICP"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/W"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 10"
+                "@value": "AHU1 Heat Power"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_336",
+        "@id": "http://example.org/IBAL#Jnc16-OCP1",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_1"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#d15_pos_fb"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 336"
+                "@value": "Jnc16-OCP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#zs3_out_rtd",
+        "@id": "http://example.org/IBAL#Junction_9",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "Zone3 Temperature"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
-            {
-                "@value": "analog-input,5"
-            }
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@value": "zs3_out_rtd"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+                "@id": "http://example.org/IBAL#Jnc9-ICP"
+            },
             {
-                "@value": "analog-input"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+                "@id": "http://example.org/IBAL#Jnc9-OCP"
+            },
             {
-                "@id": "http://example.org/IBAL#HVACZone_3"
+                "@id": "http://example.org/IBAL#Jnc9-OCP2"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "70.0"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@value": "Junction 9"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#HC_1_W_ICP",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "zs3 out rtd"
+                "@value": "HC 1 W ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#CoolingCoil_2",
+        "@id": "http://example.org/IBAL#Segment_29",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#CC_2_ICP"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#CC_2_OCP"
+                "@id": "http://example.org/IBAL#Damper_10_OCP"
             },
             {
-                "@id": "http://example.org/IBAL#CC_2_Water_ICP"
-            },
+                "@id": "http://example.org/IBAL#Jnc10-ICP2"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#CC_2_Water_OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Cooling coil 2"
+                "@value": "Segment 29"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_heat_c",
+        "@id": "http://example.org/IBAL#Channel_79",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://example.org/IBAL#AHU_1_Connection_3"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://example.org/IBAL#ahu2_cc_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU1 Heat C"
+                "@value": "Channel 79"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_1_W_ICP",
+        "@id": "http://example.org/IBAL#Channel_4",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#PressureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://example.org/IBAL#AHU_2_Connection_3"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#ahu1_p_up"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 1 W ICP"
+                "@value": "Channel 4"
             }
         ]
     },
@@ -11897,172 +12098,231 @@
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_106",
+        "@id": "http://example.org/IBAL#ahu1_t_sa",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@id": "http://example.org/IBAL#Segment_12"
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "60"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#zs1_out_rtd"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 106"
+                "@value": "AHU 1 T SA"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VFD_4",
+        "@id": "http://example.org/IBAL#d17_pos_fb",
         "@type": [
-            "http://data.ashrae.org/standard223#VariableFrequencyDrive"
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://example.org/IBAL#VFD_4_ICP"
-            },
+                "@value": "VAV3 Damper Feedback Signal"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://example.org/IBAL#VFD_4_OCP"
+                "@value": "analog-input,1"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "VFD 4"
+                "@value": "d17_pos_fb"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2",
-        "@type": [
-            "http://data.ashrae.org/standard223#ThreeWayValve"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_ICP_1"
-            },
+                "@value": "analog-input"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_ICP_2"
-            },
+                "@id": "http://example.org/IBAL#VAV_3"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#present-value": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_OCP"
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "0.0"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 2"
+                "@value": "d17 pos fb"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedDamper_18",
+        "@id": "http://example.org/IBAL#VAV_3",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
+            "http://data.ashrae.org/bacnet/2020#BACnetDevice",
+            "http://data.ashrae.org/standard223#TerminalUnit"
+        ],
+        "http://data.ashrae.org/bacnet/2020#hasPort": [
+            {
+                "@id": "http://data.ashrae.org/bacnet/2020#P_47813"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "http://example.org/IBAL#HeatingCoil_5"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_3"
+            }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#Damper_18_ICP"
+                "@id": "http://example.org/IBAL#VAV_3_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Damper_18_OCP"
+                "@id": "http://example.org/IBAL#VAV_3_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized damper 18"
+                "@value": "VAV 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_1_ICP",
+        "@id": "http://example.org/IBAL#AHU_3_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#Segment_52"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#VAV_1_ICP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 1 ICP"
+                "@value": "AHU 3 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_134",
+        "@id": "http://example.org/IBAL#vav1_out_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://example.org/IBAL#HeatExchange_Connection"
+                "@value": "VAV1 Discharge Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://example.org/IBAL#hx3_pg_rtd"
+                "@value": "analog-input,2"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-name": [
+            {
+                "@value": "vav1_out_rtd"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-type": [
+            {
+                "@value": "analog-input"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
+            {
+                "@id": "http://example.org/IBAL#VAV_1"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#present-value": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "70.0"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 129"
+                "@value": "vav1 out rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_201",
+        "@id": "http://example.org/IBAL#Jnc10-OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_2"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#d16_pos_c"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 201"
+                "@value": "Jnc10-OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#pl_f",
+        "@id": "http://example.org/IBAL#exf1_on",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/GAL_US-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "pl f"
+                "@value": "exf1 on"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc5-ICP1",
+        "@id": "http://example.org/IBAL#Jnc3-ICP2",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -12073,130 +12333,126 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc5-ICP1"
+                "@value": "Jnc3-ICP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedDamper_12",
+        "@id": "http://example.org/IBAL#CC_2_Water_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Damper_12_ICP"
-            },
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://example.org/IBAL#Damper_12_OCP"
+                "@id": "http://example.org/IBAL#AHU_2_G_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized damper 12"
+                "@value": " CC 2 Water OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_ICP_2",
+        "@id": "http://example.org/IBAL#Channel_107",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#HVAC_Space_2_ICP"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2"
+                "@id": "http://example.org/IBAL#zs2_heat_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 2 ICP 2"
+                "@value": "Channel 107"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc21-ICP1",
+        "@id": "http://example.org/IBAL#Channel_14",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#PressureSensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_61"
+                "@id": "http://example.org/IBAL#Exhaust_Fan_1_Connection_2"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#exf1_p_down"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc21-ICP1"
+                "@value": "Channel 14"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_2_VFD_2",
+        "@id": "http://example.org/IBAL#HC_4_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Fan_2_S_ICP"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#VFD_2_OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://example.org/IBAL#AHU_2_ICP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 2 VFD 2"
+                "@value": "HC 4 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_75",
+        "@id": "http://example.org/IBAL#oau_in_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc26-ICP2"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_4_OCP"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 75"
+                "@value": "oau in rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_38",
+        "@id": "http://example.org/IBAL#Segment_43",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Damper_13_ICP"
+                "@id": "http://example.org/IBAL#Damper_15_OCP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc12-OCP1"
+                "@id": "http://example.org/IBAL#Jnc12-ICP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -12206,150 +12462,142 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 38"
+                "@value": "Segment 43"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_363AO",
+        "@id": "http://example.org/IBAL#MotorizedDamper_13",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_3"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "http://example.org/IBAL#Damper_13_ICP"
+            },
             {
-                "@id": "http://example.org/IBAL#d17_pos_c"
+                "@id": "http://example.org/IBAL#Damper_13_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 363AO"
+                "@value": "Motorized damper 13"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VFD_4_ICP",
+        "@id": "http://example.org/IBAL#Channel_327T",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://example.org/IBAL#Segment_39"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#ahu2_t_sa"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VFD 4 ICP"
+                "@value": "Channel 327T"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_38",
+        "@id": "http://example.org/IBAL#Channel_111",
         "@type": [
-            "http://data.ashrae.org/standard223#HumiditySensor"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_14"
+                "@id": "http://example.org/IBAL#HVAC_Space_4_ICP"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#zs2_rh"
+                "@id": "http://example.org/IBAL#zs4_heat_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 38"
+                "@value": "Channel 111"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_66",
+        "@id": "http://example.org/IBAL#Junction_19",
         "@type": [
-            "http://data.ashrae.org/standard223#ElectricMeter"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#HeatingCoil_6"
+                "@id": "http://example.org/IBAL#Jnc19-ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc19-OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc19-OCP2"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#vav4_heat_power"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 66"
+                "@value": "Junction 19"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#PlateHeatExchange_1_Lower_OCP",
+        "@id": "http://example.org/IBAL#Jnc28-OCP1",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@value": "Plate Heat Exchange 1 Lower OCP"
+                "@id": "http://example.org/IBAL#Segment_77"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_ICP_2",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 1 ICP 2"
+                "@value": "Jnc28-OCP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_33",
+        "@id": "http://example.org/IBAL#Jnc33-ICP2",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc33-ICP1"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc33-OCP"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Jnc33-OCP2"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#Junction_33"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 33"
+                "@value": "Jnc33-ICP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc1-OCP1",
+        "@id": "http://example.org/IBAL#Jnc16-OCP2",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -12360,162 +12608,145 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc1-OCP1"
+                "@value": "Jnc16-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_88_Temp",
+        "@id": "http://example.org/IBAL#MotorizedDamper_16",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
-            }
-        ],
-        "http://qudt.org/schema/qudt/value": [
+                "@id": "http://example.org/IBAL#Damper_16_ICP"
+            },
             {
-                "@value": "62"
+                "@id": "http://example.org/IBAL#Damper_16_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment_88_Temp"
+                "@value": "Motorized damper 16"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc14-ICP1",
+        "@id": "http://example.org/IBAL#AHU_3_G_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc14-ICP1"
+                "@value": "AHU 3 G ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_31",
+        "@id": "http://example.org/IBAL#HeatingCoil_5",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#Jnc31-ICP1"
+                "@id": "http://example.org/IBAL#HC_5_E_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc31-ICP2"
+                "@id": "http://example.org/IBAL#HC_5_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc31-OCP"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "http://example.org/IBAL#HC_5_OCP"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#HC_5_W_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_5_W_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 31"
+                "@value": "Heating coil 5"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#v13_pos_c",
+        "@id": "http://example.org/IBAL#ahu1_rh_up",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "60"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@value": "v13 pos c"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Jnc38-OCP2",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/value": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@value": "60"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc38-OCP2"
+                "@value": "AHU 1 RH Up"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_29",
+        "@id": "http://example.org/IBAL#HVAC_Space_2_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc29-ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc29-OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc29-OCP2"
+                "@id": "http://example.org/IBAL#Segment_14"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 29"
+                "@value": "HVAC Space2 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#zs2_t_sp_f",
+        "@id": "http://example.org/IBAL#zs3_out_rtd",
         "@type": [
             "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
-            "http://data.ashrae.org/standard223#QuantifiableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@value": "Zone2 Temperature Setpoint"
+                "@value": "Zone3 Temperature"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@value": "analog-input,6"
+                "@value": "analog-input,5"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "zs2_t_sp_f"
+                "@value": "zs3_out_rtd"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-type": [
@@ -12525,18 +12756,13 @@
         ],
         "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#VAV_2"
+                "@id": "http://example.org/IBAL#HVACZone_3"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#present-value": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "74.0"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Aspect-Setpoint"
+                "@value": "70.0"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
@@ -12551,335 +12777,228 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "zs2 t sp f"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_ICP_1",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
-            {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Motorized three way valve 3 ICP 1"
+                "@value": "zs3 out rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_6_W_OCP",
+        "@id": "http://example.org/IBAL#AHU_3_Connection_2",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 6 W OCP"
+                "@value": "AHU 3 Connection 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Enclosure_4",
+        "@id": "http://example.org/IBAL#Segment_18",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
-        ],
-        "http://data.ashrae.org/standard223#encloses": [
-            {
-                "@id": "http://example.org/IBAL#HVACSpace_4"
-            }
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@value": "Enclosure 4"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#exf2_f",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "http://example.org/IBAL#HVAC_Space_4_OCP"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://example.org/IBAL#Jnc6-ICP2"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "exf2 f"
+                "@value": "Segment 18"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_83",
+        "@id": "http://example.org/IBAL#Channel_8",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#PressureSensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc31-ICP2"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#WaterPump_2_OCP"
+                "@id": "http://example.org/IBAL#AHU_1_Connection_3"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#ahu2_p_up"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 83"
+                "@value": "Channel 8"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_25",
-        "@type": [
-            "http://data.ashrae.org/standard223#Junction"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc25-ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc25-OCP1"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc25-OCP2"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
-            }
-        ],
+        "@id": "http://example.org/IBAL#Temp_7",
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 25"
+                "@value": "Channel 106"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV4_FnB",
+        "@id": "http://example.org/IBAL#Channel_86",
         "@type": [
-            "http://data.ashrae.org/standard223#FunctionBlock"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasInput": [
-            {
-                "@id": "http://example.org/IBAL#d18_pos_fb"
-            },
-            {
-                "@id": "http://example.org/IBAL#vav4_f"
-            },
-            {
-                "@id": "http://example.org/IBAL#vav4_out_rtd"
-            },
-            {
-                "@id": "http://example.org/IBAL#vav4_t_in"
-            },
-            {
-                "@id": "http://example.org/IBAL#zs4_out_rtd"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#zs4_t_sp_f"
+                "@id": "http://example.org/IBAL#Segment_44"
             }
         ],
-        "http://data.ashrae.org/standard223#hasOutput": [
-            {
-                "@id": "http://example.org/IBAL#d18_pos_c"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#vav4_heat_c"
+                "@id": "http://example.org/IBAL#oau_out_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV4 Fn b"
+                "@value": "Channel 86"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_19",
+        "@id": "http://example.org/IBAL#zs1_t_sp_f",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc19-ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc19-OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc19-OCP2"
-            }
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@value": "Zone1 Temperature Setpoint"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@value": "Junction 19"
+                "@value": "analog-input,6"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Channel_18",
-        "@type": [
-            "http://data.ashrae.org/standard223#ElectricMeter"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@id": "http://example.org/IBAL#VFD_3"
+                "@value": "zs1_t_sp_f"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@id": "http://example.org/IBAL#exf1_power"
+                "@value": "analog-input"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@value": "Channel 18"
+                "@id": "http://example.org/IBAL#VAV_1"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Fan_2_S_ICP",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#present-value": [
             {
-                "@id": "http://data.ashrae.org/standard223#Electricity-Signal"
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "74.0"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@value": "Fan 2 S ICP"
+                "@id": "http://data.ashrae.org/standard223#Aspect-Setpoint"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#exf2_on",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "exf2 on"
+                "@value": "zs1 t sp f"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_11_ICP",
+        "@id": "http://example.org/IBAL#Jnc36-OCP2",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_39"
+                "@id": "http://example.org/IBAL#Segment_98"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 11 ICP"
+                "@value": "Jnc36-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_395gw",
+        "@id": "http://example.org/IBAL#Segment_84",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#AHU_3"
+                "@id": "http://example.org/IBAL#Jnc30-OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc31-ICP1"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#ahu2_on"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 395gw"
+                "@value": "Segment 84"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4",
+        "@id": "http://example.org/IBAL#Channel_106",
         "@type": [
-            "http://data.ashrae.org/standard223#ThreeWayValve"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_ICP_1"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_ICP_2"
-            },
+                "@id": "http://example.org/IBAL#Segment_12"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_OCP"
+                "@id": "http://example.org/IBAL#zs1_out_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 4"
+                "@value": "Channel 106"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_33",
+        "@id": "http://example.org/IBAL#Jnc15-OCP1",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Damper_9_OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc11-ICP1"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -12888,37 +13007,42 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 33"
+                "@value": "Jnc15-OCP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc32-ICP2",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_ICP_1",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc32-ICP2"
+                "@value": "Motorized three way valve 3 ICP 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_48",
+        "@id": "http://example.org/IBAL#Segment_9",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Damper_17_ICP"
+                "@id": "http://example.org/IBAL#AHU_2_OCP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc16-OCP1"
+                "@id": "http://example.org/IBAL#Jnc4-ICP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -12928,161 +13052,131 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 48"
+                "@value": "Segment 9"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_453",
+        "@id": "http://example.org/IBAL#HVAC_Space_1_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#VFD_3"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#exf1_vfd"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 453"
+                "@value": "HVAC Space 1 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc30-ICP",
+        "@id": "http://example.org/IBAL#HC_6_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc30-ICP"
+                "@value": "HC 6 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc29-OCP",
+        "@id": "http://example.org/IBAL#Jnc4-OCP2",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc29-OCP"
+                "@value": "Jnc4-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_93",
+        "@id": "http://example.org/IBAL#MotorizedDamper_5",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#Jnc34-OCP1"
+                "@id": "http://example.org/IBAL#Damper_5_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc35-ICP2"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#Damper_5_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 93"
+                "@value": "Motorized damper 5"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU1_FnB",
+        "@id": "http://example.org/IBAL#d11_pos_fb",
         "@type": [
-            "http://data.ashrae.org/standard223#FunctionBlock"
-        ],
-        "http://data.ashrae.org/standard223#hasInput": [
-            {
-                "@id": "http://example.org/IBAL#ahu2_out_rtd"
-            },
-            {
-                "@id": "http://example.org/IBAL#ahu2_p_down"
-            },
-            {
-                "@id": "http://example.org/IBAL#d15_pos_c"
-            },
-            {
-                "@id": "http://example.org/IBAL#d16_pos_c"
-            },
-            {
-                "@id": "http://example.org/IBAL#v13_pos_fb"
-            },
-            {
-                "@id": "http://example.org/IBAL#vav1_heat_c"
-            },
-            {
-                "@id": "http://example.org/IBAL#vav2_heat_c"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasOutput": [
-            {
-                "@id": "http://example.org/IBAL#ahu2_vfd"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#v13_pos_c"
+                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU1 Fn b"
+                "@value": "d11 pos fb"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu2_f_ra",
+        "@id": "http://example.org/IBAL#Junction_23",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://example.org/IBAL#Jnc23-ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc23-ICP2"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc23-OCP"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu2 f ra"
+                "@value": "Junction 23"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_71",
+        "@id": "http://example.org/IBAL#Segment_101",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc25-OCP2"
+                "@id": "http://example.org/IBAL#Jnc18-ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc26-ICP1"
+                "@id": "http://example.org/IBAL#Jnc38-OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -13092,270 +13186,315 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 71"
+                "@value": "Segment 101"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_383",
+        "@id": "http://example.org/IBAL#Channel_303",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#FlowSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1"
+                "@id": "http://example.org/IBAL#Segment_7"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#v12_pos_fb"
+                "@id": "http://example.org/IBAL#vav3_f"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 383"
+                "@value": "Channel 303"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VFD_2_OCP",
+        "@id": "http://example.org/IBAL#VAV_2",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/bacnet/2020#BACnetDevice",
+            "http://data.ashrae.org/standard223#TerminalUnit"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#hasPort": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://data.ashrae.org/bacnet/2020#P_47812"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "http://example.org/IBAL#HeatingCoil_3"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_2"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "http://example.org/IBAL#VAV_2_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#VAV_2_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VFD 2 OCP"
+                "@value": "VAV 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_106",
+        "@id": "http://example.org/IBAL#zs4_rh",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@id": "http://example.org/IBAL#AHU_2_G_OCP"
-            },
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "30"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_ICP_1"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 106"
+                "@value": "zsh4 rh"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_3_ICP",
+        "@id": "http://example.org/IBAL#Channel_198",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#FlowSensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_52"
+                "@id": "http://example.org/IBAL#Segment_106"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#ahu2_f_cc_mag"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 3 ICP"
+                "@value": "Channel 198"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HVAC_Space_3_ICP",
+        "@id": "http://example.org/IBAL#Enclosure_4",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
+            {
+                "@id": "http://example.org/IBAL#HVACSpace_4"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Enclosure 4"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Chiller_1_Upper_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HVAC Space 3 ICP"
+                "@value": "Chiller 1 Upper OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#d11_pos_fb",
+        "@id": "http://example.org/IBAL#CC_2_Bypass_Connection",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#connectsAt": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_1_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_ICP_2"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d11 pos fb"
+                "@value": "CC 2 Bypass Connection"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU2_FnB",
+        "@id": "http://example.org/IBAL#Junction_4",
         "@type": [
-            "http://data.ashrae.org/standard223#FunctionBlock"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#hasInput": [
-            {
-                "@id": "http://example.org/IBAL#ahu1_out_rtd"
-            },
-            {
-                "@id": "http://example.org/IBAL#ahu1_p_down"
-            },
-            {
-                "@id": "http://example.org/IBAL#d17_pos_c"
-            },
-            {
-                "@id": "http://example.org/IBAL#d18_pos_c"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#v12_pos_fb"
+                "@id": "http://example.org/IBAL#Jnc4-ICP"
             },
             {
-                "@id": "http://example.org/IBAL#vav3_heat_c"
+                "@id": "http://example.org/IBAL#Jnc4-OCP1"
             },
             {
-                "@id": "http://example.org/IBAL#vav4_heat_c"
+                "@id": "http://example.org/IBAL#Jnc4-OCP2"
             }
         ],
-        "http://data.ashrae.org/standard223#hasOutput": [
-            {
-                "@id": "http://example.org/IBAL#ahu1_vfd"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#v12_pos_c"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU2 Fn b"
+                "@value": "Junction 4"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Enclosure_1",
+        "@id": "http://example.org/IBAL#Junction_24",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#HVACSpace_1"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "http://example.org/IBAL#Jnc24-ICP"
+            },
             {
-                "@value": "Enclosure 1"
+                "@id": "http://example.org/IBAL#Jnc24-OCP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc24-OCP2"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#d8_pos_c",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d8 pos c"
+                "@value": "Junction 24"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#zs1_rh",
+        "@id": "http://example.org/IBAL#ahu1_f_sa",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasValue": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "80"
+                "@value": "600"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://qudt.org/schema/qudt/value": [
             {
-                "@value": "80"
+                "@value": "600"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "zs1_rh"
+                "@value": "AHU 1 F SA"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ch1_f_e",
+        "@id": "http://example.org/IBAL#Channel_74",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://example.org/IBAL#AHU_2_Connection_2"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/GAL_US-PER-MIN"
+                "@id": "http://example.org/IBAL#ahu1_heat_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ch1 f e"
+                "@value": "Channel 74"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#zs4_out_rtd",
+        "@id": "http://example.org/IBAL#Channel_326T",
+        "@type": [
+            "http://data.ashrae.org/standard223#TemperatureSensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "http://example.org/IBAL#Segment_38"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#ahu1_t_sa"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Channel 326T"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#vav2_f",
         "@type": [
             "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@value": "Zone4 Temperature"
+                "@value": "VAV2 Airflow Rate"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@value": "analog-input,5"
+                "@value": "analog-input,4"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "zs4_out_rtd"
+                "@value": "vav2_f"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-type": [
@@ -13365,167 +13504,95 @@
         ],
         "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#HVACZone_4"
+                "@id": "http://example.org/IBAL#VAV_2"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#present-value": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "70.0"
+                "@value": "0.0"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "zs4_out_rtd"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Fan_2_ICP",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Fan 2 ICP"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#AHU_2_OCP",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "AHU 2 OCP"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Channel_327",
-        "@type": [
-            "http://data.ashrae.org/standard223#FlowSensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#Segment_39"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "http://example.org/IBAL#ahu2_f_sa"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 327"
+                "@value": "vav2 f"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_13",
+        "@id": "http://example.org/IBAL#ahu2_out_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc19-OCP"
-            },
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_2_ICP"
+                "@value": "AHU2 Supply Air Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@value": "analog-input,2"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "Segment 13"
+                "@value": "ahu2_out_rtd"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Segment_49",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Damper_18_ICP"
-            },
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@id": "http://example.org/IBAL#Jnc16-OCP2"
+                "@value": "analog-input"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#AHU_1"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#present-value": [
             {
-                "@value": "Segment 49"
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "70.0"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Segment_104",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#connectsAt": [
-            {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_ICP_1"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#ThermalStorage_1_OCP"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 104"
+                "@value": "ahu2 out rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_82",
+        "@id": "http://example.org/IBAL#Segment_74",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc30-ICP"
+                "@id": "http://example.org/IBAL#Jnc27-OCP1"
             },
             {
-                "@id": "http://example.org/IBAL#WaterPump_3_OCP"
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_4_ICP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -13535,58 +13602,64 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 82"
+                "@value": "Segment 74"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_1_Connection_2",
+        "@id": "http://example.org/IBAL#VFD_4",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#VariableFrequencyDrive"
         ],
-        "http://data.ashrae.org/standard223#connectsAt": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#CC_1_ICP"
+                "@id": "http://example.org/IBAL#VFD_4_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#HC_1_OCP"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#VFD_4_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 1 Connection 2"
+                "@value": "VFD 4"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc24-OCP2",
+        "@id": "http://example.org/IBAL#Channel_40",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#HumiditySensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#Segment_18"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#zs4_rh"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc24-OCP2"
+                "@value": "Channel 40"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_3_OCP",
+        "@id": "http://example.org/IBAL#Junction_10",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_44"
+                "@id": "http://example.org/IBAL#Jnc10-ICP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc10-ICP2"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc10-OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -13596,173 +13669,141 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 3 OCP"
+                "@value": "Junction 10"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ThermalStorage_1_ICP",
+        "@id": "http://example.org/IBAL#ManualTwoWayValve_5",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#TwoWayValve"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#Segment_89"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_5_ICP"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_5_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Thermal Storage 1 ICP"
+                "@value": "Manual two way valve 5"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_4_OCP",
+        "@id": "http://example.org/IBAL#WaterPump_3_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 4 OCP"
+                "@value": "Water pump 3 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_OCP",
+        "@id": "http://example.org/IBAL#MotorizedDamper_3",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
-            }
-        ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+                "@id": "http://example.org/IBAL#Damper_3_ICP"
+            },
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2"
+                "@id": "http://example.org/IBAL#Damper_3_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 2 OCP"
+                "@value": "Motorized damper 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_301",
+        "@id": "http://example.org/IBAL#Channel_306",
         "@type": [
             "http://data.ashrae.org/standard223#FlowSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_2"
+                "@id": "http://example.org/IBAL#Segment_27"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#vav1_f"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Channel 301"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#exf1_f",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://example.org/IBAL#exf1_f"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "exf1 f"
+                "@value": "Channel 306"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_37",
+        "@id": "http://example.org/IBAL#Channel_89",
         "@type": [
-            "http://data.ashrae.org/standard223#HumiditySensor"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_12"
+                "@id": "http://example.org/IBAL#VAV_3_Connection_2"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#zs1_rh"
+                "@id": "http://example.org/IBAL#vav3_out_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 37"
+                "@value": "Channel 89"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_56",
+        "@id": "http://example.org/IBAL#HC_7_W_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#AHU_2_G_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc18-OCP"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 56"
+                "@value": "HC 7 W OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#zs2_out_rtd",
+        "@id": "http://example.org/IBAL#vav1_f",
         "@type": [
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@value": "Zone2 Temperature"
+                "@value": "VAV1 Airflow Rate"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@value": "analog-input,5"
+                "@value": "analog-input,4"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "Zone2 Temperature"
+                "@value": "VAV1-Airflow"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-type": [
@@ -13772,56 +13813,77 @@
         ],
         "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#VAV_2"
+                "@id": "http://example.org/IBAL#VAV_1"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#present-value": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "70.0"
+                "@value": "0.0"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "zs2 out rtd"
+                "@value": "VAV1 F"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu2_rh_up",
+        "@id": "http://example.org/IBAL#ahu2_heat_c",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu2 rh up"
+                "@value": "ahu2 heat c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc21-ICP2",
+        "@id": "http://example.org/IBAL#Channel_307",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#FlowSensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "http://example.org/IBAL#Segment_30"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#exf2_f"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Channel 307"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Jnc27-OCP1",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -13830,18 +13892,21 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc21-ICP2"
+                "@value": "Jnc27-OCP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc9-OCP2",
+        "@id": "http://example.org/IBAL#Segment_45",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_27"
+                "@id": "http://example.org/IBAL#Damper_15_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc15-OCP1"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -13851,91 +13916,88 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc9-OCP2"
+                "@value": "Segment 45"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_326T",
+        "@id": "http://example.org/IBAL#Damper_2_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#Segment_38"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#ahu1_t_sa"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 326T"
+                "@value": "Damper 2 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Temp_7",
+        "@id": "http://example.org/IBAL#Jnc8-OCP1",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 106"
+                "@value": "Jnc8-OCP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_28",
+        "@id": "http://example.org/IBAL#exf1_p_down",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Damper_8_OCP"
-            },
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#Jnc10-ICP1"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PA"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 28"
+                "@value": "exf1 p down"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_21",
+        "@id": "http://example.org/IBAL#Jnc30-OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Damper_6_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc7-OCP2"
+                "@id": "http://example.org/IBAL#Segment_84"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 21"
+                "@value": "Jnc30-OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc20-ICP",
+        "@id": "http://example.org/IBAL#AHU_2_G_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -13944,207 +14006,275 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc20-ICP"
+                "@value": "AHU 2 G OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_77",
+        "@id": "http://example.org/IBAL#HeatingCoil_6",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#AHU_1_ICP"
+                "@id": "http://example.org/IBAL#HC_6_E_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_6_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_6_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_6_W_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_6_W_OCP"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://example.org/IBAL#ahu2_in_rtd"
+                "@value": "IBAL:VAV4_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 77"
+                "@value": "Heating coil 6"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_1_OCP",
+        "@id": "http://example.org/IBAL#vav3_f",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@value": "VAV3 Airflow Rate"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
+            {
+                "@value": "analog-input,4"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-name": [
+            {
+                "@value": "vav3_f"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-type": [
+            {
+                "@value": "analog-input"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
+            {
+                "@id": "http://example.org/IBAL#VAV_3"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#present-value": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "0.0"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 1 OCP"
+                "@value": "vav3 f"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_18_OCP",
+        "@id": "http://example.org/IBAL#CoolingCoil_2",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#CoolingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+                "@id": "http://example.org/IBAL#CC_2_ICP"
+            },
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_18"
+                "@id": "http://example.org/IBAL#CC_2_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#CC_2_Water_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#CC_2_Water_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 18 OCP"
+                "@value": "Cooling coil 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc19-ICP",
+        "@id": "http://example.org/IBAL#Damper_10_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Segment_102"
-            }
-        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc19-ICP"
+                "@value": "Damper 10 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_46",
+        "@id": "http://example.org/IBAL#Segment_97_Temp",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#Damper_16_ICP"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#Jnc15-OCP2"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/value": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@value": "60"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 46"
+                "@value": "Segment_97_Temp"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_128",
+        "@id": "http://example.org/IBAL#Channel_108",
         "@type": [
             "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_67"
+                "@id": "http://example.org/IBAL#Segment_14"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#sl_out_rtd"
+                "@id": "http://example.org/IBAL#zs2_out_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 128"
+                "@value": "Channel 108"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc18-ICP",
+        "@id": "http://example.org/IBAL#HVAC_Space_3_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Segment_16"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc18-ICP"
+                "@value": "HVAC Space 3 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_1_OCP",
+        "@id": "http://example.org/IBAL#ahu2_p_up",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PA"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 1 OCP"
+                "@value": "ahu2 p up"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ManualTwoWayValve_2_OCP",
+        "@id": "http://example.org/IBAL#Segment_16",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#HVAC_Space_3_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc6-ICP1"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Manual two way valve 2 OCP"
+                "@value": "Segment 16"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_130",
+        "@id": "http://example.org/IBAL#Channel_85",
         "@type": [
             "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#PlateHeatExchange_1_Connection"
+                "@id": "http://example.org/IBAL#AHU_3_Connection_3"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#hx1_pg_rtd"
+                "@id": "http://example.org/IBAL#oau_hs_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 130"
+                "@value": "Channel 85"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc13-ICP2",
+        "@id": "http://example.org/IBAL#VAV_3_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -14153,50 +14283,33 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc13-ICP2"
+                "@value": "VAV 3 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_2_S_ICP",
+        "@id": "http://example.org/IBAL#Channel_328",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Electricity-Signal"
-            }
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "AHU 2 S ICP"
+                "@id": "http://example.org/IBAL#MotorizedDamper_11"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Fan_5",
-        "@type": [
-            "http://data.ashrae.org/standard223#Fan"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#Fan_5_E_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Fan_5_ICP"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#Fan_5_OCP"
+                "@id": "http://example.org/IBAL#d7_pos_fb"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 5"
+                "@value": "Channel 328"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc8-ICP",
+        "@id": "http://example.org/IBAL#Jnc2-ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -14207,94 +14320,99 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc8-ICP"
+                "@value": "Jnc2-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ch1_e_in_rtd",
+        "@id": "http://example.org/IBAL#HC_3_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://example.org/IBAL#VAV_2_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ch1 e in rtd"
+                "@value": "HC 3 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Chiller_1_Lower_ICP",
+        "@id": "http://example.org/IBAL#AHU_2_Zone",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomainSpace": [
+            {
+                "@id": "http://example.org/IBAL#HVACSpace_3"
+            },
+            {
+                "@id": "http://example.org/IBAL#HVACSpace_4"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Chiller 1 Lower ICP"
+                "@value": "AHU 2 Zone"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#PlateHeatExchange_1_ConnectionTemperature",
+        "@id": "http://example.org/IBAL#zs1_rh",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasValue": [
             {
                 "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "60"
+                "@value": "80"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+            }
+        ],
+        "http://qudt.org/schema/qudt/value": [
+            {
+                "@value": "80"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Plate heat exchange 1 Connection temperature"
+                "@value": "zs1_rh"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc12-OCP1",
+        "@id": "http://example.org/IBAL#Segment_30",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "http://example.org/IBAL#Fan_4_ICP"
+            },
             {
-                "@value": "Jnc12-OCP1"
+                "@id": "http://example.org/IBAL#Jnc10-OCP"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#HC_7_OCP",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -14303,275 +14421,252 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 7OCP"
+                "@value": "Segment 30"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav1_out_rtd",
+        "@id": "http://example.org/IBAL#VFD_2",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "VAV1 Discharge Temperature"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
-            {
-                "@value": "analog-input,2"
-            }
+            "http://data.ashrae.org/standard223#VariableFrequencyDrive"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "vav1_out_rtd"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+                "@id": "http://example.org/IBAL#VFD_2_ICP"
+            },
             {
-                "@value": "analog-input"
+                "@id": "http://example.org/IBAL#VFD_2_OCP"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://example.org/IBAL#VAV_1"
+                "@id": "http://example.org/IBAL#ahu1_vfd"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "70.0"
+                "@value": "VFD 2"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Channel_130",
+        "@type": [
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://example.org/IBAL#PlateHeatExchange_1_Connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://example.org/IBAL#hx1_pg_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav1 out rtd"
+                "@value": "Channel 130"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VFD_4_OCP",
+        "@id": "http://example.org/IBAL#Jnc19-OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VFD 4 OCP"
+                "@value": "Jnc19-OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_10",
+        "@id": "http://example.org/IBAL#Jnc21-ICP1",
         "@type": [
-            "http://data.ashrae.org/standard223#HumiditySensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_1"
+                "@id": "http://example.org/IBAL#Segment_61"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#ahu2_rh_down"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 10"
+                "@value": "Jnc21-ICP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC-5-OutletFlow",
+        "@id": "http://example.org/IBAL#ThermalStorage_1_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasValue": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "20"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/value": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "20"
+                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 5 OutletFlow"
+                "@value": "Thermal Storage 1 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_335AO",
+        "@id": "http://example.org/IBAL#Channel_200",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#FlowSensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservtaionLocation": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_12"
+                "@id": "http://example.org/IBAL#Segment_69"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#d8_pos_c"
+                "@id": "http://example.org/IBAL#pl_f"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 335AO"
+                "@value": "Channel 200"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_ICP_1",
+        "@id": "http://example.org/IBAL#WaterPump_2",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+                "@id": "http://example.org/IBAL#WaterPump_2_ICP"
+            },
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5"
+                "@id": "http://example.org/IBAL#WaterPump_2_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 5 ICP 1"
+                "@value": "Water pump 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ch1_power",
+        "@id": "http://example.org/IBAL#Segment_100",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://example.org/IBAL#Jnc37-OCP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc38-ICP"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/W"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ch1 power"
+                "@value": "Segment 100"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#WaterPump_2_ICP",
+        "@id": "http://example.org/IBAL#MotorizedDamper_6",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://example.org/IBAL#Damper_6_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Damper_6_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Water pump 2 ICP"
+                "@value": "Motorized damper 6"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_2_ICP",
+        "@id": "http://example.org/IBAL#Channel_495",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_42"
+                "@id": "http://example.org/IBAL#MotorizedDamper_8"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#d10_pos_fb"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 2 ICP"
+                "@value": "Channel 495"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HVAC_Space_2_ICP",
+        "@id": "http://example.org/IBAL#MotorizedDamper_4",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#d18_pos_c"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "HVAC Space 2 ICP"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Damper_3_OCP",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+                "@id": "http://example.org/IBAL#Damper_4_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Damper_4_OCP"
+            }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@value": "IBAL:VAV4_ICP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 3 OCP"
+                "@value": "Motorized damper 4"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_1",
+        "@id": "http://example.org/IBAL#Segment_6",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#AHU_1_OCP"
+                "@id": "http://example.org/IBAL#Damper_5_OCP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc1-ICP"
+                "@id": "http://example.org/IBAL#Jnc3-ICP1"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -14581,36 +14676,33 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 1"
+                "@value": "Segment 6"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_97",
+        "@id": "http://example.org/IBAL#Channel_456",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc36-ICP"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#WaterPump_4_OCP"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#v8_pos_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 97"
+                "@value": "Channel 456"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc1-ICP",
+        "@id": "http://example.org/IBAL#Damper_12_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -14619,24 +14711,21 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_12"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc1-ICP"
+                "@value": "Damper 12 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_27",
+        "@id": "http://example.org/IBAL#Jnc2-OCP2",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Fan_3_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc9-OCP2"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -14645,238 +14734,241 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 27"
+                "@value": "Jnc2-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_7_ICP",
+        "@id": "http://example.org/IBAL#Channel_426",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#AHU_3_Connection_2"
+                "@id": "http://example.org/IBAL#MotorizedDamper_6"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#d11_pos_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 7 ICP"
+                "@value": "Channel 426"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_16_OCP",
+        "@id": "http://example.org/IBAL#Channel_159",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#Segment_92"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_16"
+                "@id": "http://example.org/IBAL#pl_out_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 16 OCP"
+                "@value": "Channel 159"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_23",
+        "@id": "http://example.org/IBAL#CC_1_Bypass_Connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#connectsAt": [
             {
-                "@id": "http://example.org/IBAL#Damper_14_ICP"
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_2_OCP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc8-OCP1"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_ICP_2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 23"
+                "@value": "CC 1 Bypass Connection"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedDamper_19",
+        "@id": "http://example.org/IBAL#Damper_13_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Damper_19_ICP"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://example.org/IBAL#Damper_19_OCP"
+                "@id": "http://example.org/IBAL#MotorizedDamper_13"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized damper 19"
+                "@value": "Damper 13 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ch2_e_out_rtd",
+        "@id": "http://example.org/IBAL#VFD_3_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ch2 e out rtd"
+                "@value": "VFD 3 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_1_OCP",
+        "@id": "http://example.org/IBAL#Junction_22",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#Jnc22-ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc22-OCP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc22-OCP2"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#AHU_1_OCP"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 1 OCP"
+                "@value": "Junction 22"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_2_OCP",
+        "@id": "http://example.org/IBAL#Junction_16",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#Jnc16-ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc16-OCP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc16-OCP2"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#AHU_2_OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 2 OCP"
+                "@value": "Junction 16"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_3_VFD_3",
+        "@id": "http://example.org/IBAL#exf1_p_up",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Fan_3_E_ICP"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#VFD_3_OCP"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://qudt.org/vocab/unit/PA"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 3 VFD 3"
+                "@value": "exf1 p up"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_50",
+        "@id": "http://example.org/IBAL#ThermalStorage_1_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#PressureSensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_44"
+                "@id": "http://example.org/IBAL#Segment_89"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#oau_p_down"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 50"
+                "@value": "Thermal Storage 1 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu2_in_rtd",
+        "@id": "http://example.org/IBAL#Channel_39",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#HumiditySensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://example.org/IBAL#Segment_16"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://example.org/IBAL#zs3_rh"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu2 in rtd"
+                "@value": "Channel 39"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_35",
+        "@id": "http://example.org/IBAL#Segment_82",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc35-ICP1"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc35-ICP2"
+                "@id": "http://example.org/IBAL#Jnc30-ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc35-OCP"
+                "@id": "http://example.org/IBAL#WaterPump_3_OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -14886,12 +14978,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 35"
+                "@value": "Segment 82"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_3_OCP",
+        "@id": "http://example.org/IBAL#Jnc11-OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -14900,166 +14992,160 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "http://example.org/IBAL#VAV_2_OCP"
-            }
-        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 3 OCP"
+                "@value": "Jnc11-OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#zs3_rh",
+        "@id": "http://example.org/IBAL#Jnc38-OCP2",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasValue": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "50"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "zs3 rh"
+                "@value": "Jnc38-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ch1_e_out_rtd",
+        "@id": "http://example.org/IBAL#ahu2_fan_power",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://qudt.org/vocab/unit/W"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ch1 e out rtd"
+                "@value": "ahu2 fan power"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#zs1_heat_rtd",
+        "@id": "http://example.org/IBAL#Channel_336",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#hasValue": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "66"
+                "@id": "http://example.org/IBAL#MotorizedDamper_1"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://example.org/IBAL#d15_pos_fb"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@value": "Channel 336"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Channel_3",
+        "@type": [
+            "http://data.ashrae.org/standard223#HumiditySensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "http://example.org/IBAL#HC_4_ICP"
             }
         ],
-        "http://qudt.org/schema/qudt/value": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@value": "66"
+                "@id": "http://example.org/IBAL#ahu1_rh_up"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "zs1 heat rtd"
+                "@value": "Channel 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_63",
+        "@id": "http://example.org/IBAL#Channel_124",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc22-OCP1"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#PlateHeatExchange_1_Lower_ICP"
+                "@id": "http://example.org/IBAL#Segment_105"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#ahu1_cc_out_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 63"
+                "@value": "Channel 124"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedDamper_6",
+        "@id": "http://example.org/IBAL#Jnc29-ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#Damper_6_ICP"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Damper_6_OCP"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized damper 6"
+                "@value": "Jnc29-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_12_OCP",
+        "@id": "http://example.org/IBAL#Channel_336AO",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#VAV_1"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_12"
+                "@id": "http://example.org/IBAL#d15_pos_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 12 OCP"
+                "@value": "Channel 336AO"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu2_rh_down",
+        "@id": "http://example.org/IBAL#zs3_rh",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
+        "http://data.ashrae.org/standard223#hasValue": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "50"
+            }
+        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
                 "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
@@ -15072,228 +15158,195 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu2 rh down"
+                "@value": "zs3 rh"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_8",
+        "@id": "http://example.org/IBAL#Fan_1_VFD_1",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc3-ICP2"
+                "@id": "http://example.org/IBAL#Fan_1_S_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc4-OCP1"
+                "@id": "http://example.org/IBAL#VFD_1_OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Electricity-Signal"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 8"
+                "@value": "Fan 1 to VFD 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_11_OCP",
+        "@id": "http://example.org/IBAL#Flow_7",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Segment_35"
-            }
+            "http://data.ashrae.org/standard223#FlowSensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#VAV_3_Connection_2"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_11"
+                "@id": "http://example.org/IBAL#HC-5-OutletFlow"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 11 OCP"
+                "@value": "Flow 7"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu2_p_up",
+        "@id": "http://example.org/IBAL#HC_5_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PA"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ahu2 p up"
+                "@value": "HC 5 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_59",
+        "@id": "http://example.org/IBAL#Damper_5_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#ElectricMeter"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#VFD_2"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://example.org/IBAL#ahu1_fan_power"
+                "@id": "http://example.org/IBAL#MotorizedDamper_5"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 59"
+                "@value": "Damper 5 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav4_t_in",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_ICP_1",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "VAV4 Supply Air Temperature"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
-            {
-                "@value": "analog-input,3"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
-            {
-                "@value": "vav4_t_in"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
-            {
-                "@value": "analog-input"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
-            {
-                "@id": "http://example.org/IBAL#VAV_4"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "70.0"
+                "@id": "http://example.org/IBAL#Segment_105"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav4 t in"
+                "@value": "Motorized three way valve 1 ICP 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc23-OCP",
+        "@id": "http://example.org/IBAL#AHU_3_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Segment_44"
+            }
+        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc23-OCP"
+                "@value": "AHU 3 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#PlateHeatExchange_2_Lower_OCP",
+        "@id": "http://example.org/IBAL#Channel_78",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://example.org/IBAL#AHU_1_Connection_2"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#ahu2_heat_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Plate Heat Exchange 2 Lower OCP"
+                "@value": "Channel 78"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_6_E_ICP",
+        "@id": "http://example.org/IBAL#zs1_out_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@value": "Zone1 Temperature"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@value": "HC 6 E ICP"
+                "@value": "analog-input,5"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#ahu2_f_sa",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@value": "zs1_out_rtd"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/bacnet/2020#object-type": [
+            {
+                "@value": "analog-input"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://example.org/IBAL#HVACZone_1"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#present-value": [
             {
-                "@value": "ahu2 f sa"
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "70.0"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#oau_in_rtd",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -15307,233 +15360,213 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "oau in rtd"
+                "@value": "zs1_out_rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedDamper_14",
+        "@id": "http://example.org/IBAL#MotorizedDamper_12",
         "@type": [
             "http://data.ashrae.org/standard223#Damper"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#Damper_14_ICP"
+                "@id": "http://example.org/IBAL#Damper_12_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Damper_14_OCP"
+                "@id": "http://example.org/IBAL#Damper_12_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized damper 14"
+                "@value": "Motorized damper 12"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_3",
+        "@id": "http://example.org/IBAL#Chiller_1_Upper_ICP",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#BACnetDevice",
-            "http://data.ashrae.org/standard223#TerminalUnit"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/bacnet/2020#hasPort": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/bacnet/2020#P_47813"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "http://example.org/IBAL#HeatingCoil_5"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_3"
+                "@value": "Chiller 1 Upper ICP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#VAV1_FnB",
+        "@type": [
+            "http://data.ashrae.org/standard223#FunctionBlock"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasInput": [
             {
-                "@id": "http://example.org/IBAL#VAV_3_ICP"
+                "@id": "http://example.org/IBAL#d15_pos_fb"
             },
             {
-                "@id": "http://example.org/IBAL#VAV_3_OCP"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "http://example.org/IBAL#vav1_f"
+            },
             {
-                "@value": "VAV 3"
+                "@id": "http://example.org/IBAL#vav1_out_rtd"
+            },
+            {
+                "@id": "http://example.org/IBAL#vav1_t_in"
+            },
+            {
+                "@id": "http://example.org/IBAL#zs1_out_rtd"
+            },
+            {
+                "@id": "http://example.org/IBAL#zs1_t_sp_f"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#VAV_1_ICP",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasOutput": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#d15_pos_c"
+            },
+            {
+                "@id": "http://example.org/IBAL#vav1_heat_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV 1 ICP"
+                "@value": "VAV1 Fn b"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_2_ICP",
+        "@id": "http://example.org/IBAL#Jnc26-ICP1",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV 2 ICP"
+                "@value": "Jnc26-ICP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav1_f",
+        "@id": "http://example.org/IBAL#ch1_e_in_rtd",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "VAV1 Airflow Rate"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
-            {
-                "@value": "analog-input,4"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
-            {
-                "@value": "VAV1-Airflow"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
-            {
-                "@value": "analog-input"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
-            {
-                "@id": "http://example.org/IBAL#VAV_1"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "0.0"
-            }
-        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV1 F"
+                "@value": "ch1 e in rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#WaterTempSensor_13",
+        "@id": "http://example.org/IBAL#Channel_325",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#FlowSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_97"
+                "@id": "http://example.org/IBAL#Segment_23"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#Segment_97_Temp"
+                "@id": "http://example.org/IBAL#ahu1_f_ra"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Water Temp Sensor 13"
+                "@value": "Channel 325"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_OCP",
+        "@id": "http://example.org/IBAL#HC_7_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#AHU_3_Connection_2"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 4 OCP"
+                "@value": "HC 7 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#CC_1_Water_OCP",
+        "@id": "http://example.org/IBAL#VAV_3_Connection_1",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#connectsAt": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://example.org/IBAL#Damper_3_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_5_ICP"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#AHU_1_G_OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": " CC 1 Water OCP"
+                "@value": "VAV 3 Connection 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ts_in_rtd",
+        "@id": "http://example.org/IBAL#Segment_106",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://example.org/IBAL#AHU_2_G_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_ICP_1"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "ts in rtd"
+                "@value": "Segment 106"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc3-OCP",
+        "@id": "http://example.org/IBAL#Damper_1_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -15544,178 +15577,174 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc3-OCP"
+                "@value": "Damper 1 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_3_W_ICP",
+        "@id": "http://example.org/IBAL#Channel_335",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#MotorizedDamper_12"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#d8_pos_fb"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 3 W ICP"
+                "@value": "Channel 335"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc12-OCP2",
+        "@id": "http://example.org/IBAL#Channel_51",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#HumiditySensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_39"
+                "@id": "http://example.org/IBAL#Segment_44"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#oau_rh"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc12-OCP2"
+                "@value": "Channel 51"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#sl_out_rtd",
+        "@id": "http://example.org/IBAL#Channel_127",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://example.org/IBAL#Segment_104"
             }
         ],
-        "http://qudt.org/schema/qudt/value": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@value": "64"
+                "@id": "http://example.org/IBAL#ts_out_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "sl out rtd"
+                "@value": "Channel 127"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_127",
+        "@id": "http://example.org/IBAL#HeatingCoil_3",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#Segment_104"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "http://example.org/IBAL#HC_3_E_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_3_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_3_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_3_W_ICP"
+            },
             {
-                "@id": "http://example.org/IBAL#ts_out_rtd"
+                "@id": "http://example.org/IBAL#HC_3_W_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 127"
+                "@value": "Heating coil 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#PlateHeatExchanger_1",
+        "@id": "http://example.org/IBAL#MotorizedDamper_15",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatExchanger"
+            "http://data.ashrae.org/standard223#Damper"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#PlateHeatExchange_1_Lower_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#PlateHeatExchange_1_Lower_OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#PlateHeatExchange_1_Upper_ICP"
+                "@id": "http://example.org/IBAL#Damper_15_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#PlateHeatExchange_1_Upper_OCP"
+                "@id": "http://example.org/IBAL#Damper_15_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Plate heat exchanger 1"
+                "@value": "Motorized damper 15"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_384",
+        "@id": "http://example.org/IBAL#Segment_78",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2"
+                "@id": "http://example.org/IBAL#Chiller_1_Lower_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc28-OCP2"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#v13_pos_fb"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 384"
+                "@value": "Segment 78"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_14",
+        "@id": "http://example.org/IBAL#Jnc34-OCP2",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#HVAC_Space_2_OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc5-ICP2"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 14"
+                "@value": "Jnc34-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_30",
+        "@id": "http://example.org/IBAL#Junction_31",
         "@type": [
             "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc30-ICP"
+                "@id": "http://example.org/IBAL#Jnc31-ICP1"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc30-ICP2"
+                "@id": "http://example.org/IBAL#Jnc31-ICP2"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc30-OCP"
+                "@id": "http://example.org/IBAL#Jnc31-OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -15725,312 +15754,331 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 30"
+                "@value": "Junction 31"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_40",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_ICP_1",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Damper_14_OCP"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Jnc14-ICP2"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 40"
+                "@value": "Motorized three way valve 5 ICP 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_4",
+        "@id": "http://example.org/IBAL#CoolingCoil_1",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#CoolingCoil"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#Jnc2-OCP2"
+                "@id": "http://example.org/IBAL#CC_1_Water_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#VAV_2_ICP"
+                "@id": "http://example.org/IBAL#CC_1_Water_OCP"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 4"
+                "@value": "Cooling coil 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_4_ICP",
+        "@id": "http://example.org/IBAL#AHU_3",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#AirHandlingUnit"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#CoolingCoil_3"
+            },
+            {
+                "@id": "http://example.org/IBAL#Fan_5"
+            },
+            {
+                "@id": "http://example.org/IBAL#HeatingCoil_7"
+            },
+            {
+                "@id": "http://example.org/IBAL#VFD_5"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "http://example.org/IBAL#AHU_3_G_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#AHU_3_G_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#AHU_3_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#AHU_3_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 4 ICP"
+                "@value": "AHU 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc9-OCP",
+        "@id": "http://example.org/IBAL#HVACZone_2",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomainSpace": [
+            {
+                "@id": "http://example.org/IBAL#HVACSpace_2"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc9-OCP"
+                "@value": "HVACZone 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_306",
+        "@id": "http://example.org/IBAL#Chiller_2_Upper_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#FlowSensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#Segment_27"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#exf1_f"
+                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 306"
+                "@value": "Chiller 2 Upper OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc26-ICP1",
+        "@id": "http://example.org/IBAL#Damper_1_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "http://example.org/IBAL#VAV_1_ICP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc26-ICP1"
+                "@value": "Damper 1 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_64",
+        "@id": "http://example.org/IBAL#Segment_8",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc22-OCP2"
+                "@id": "http://example.org/IBAL#Jnc3-ICP2"
             },
             {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_3_ICP"
+                "@id": "http://example.org/IBAL#Jnc4-OCP1"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 64"
+                "@value": "Segment 8"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_8",
+        "@id": "http://example.org/IBAL#Jnc1-OCP2",
         "@type": [
-            "http://data.ashrae.org/standard223#PressureSensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#AHU_1_Connection_3"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#ahu2_p_up"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 8"
+                "@value": "Jnc1-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc17-OCP",
+        "@id": "http://example.org/IBAL#Segment_92",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_52"
+                "@id": "http://example.org/IBAL#Jnc34-ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc17-OCP"
+                "@value": "Segment 92"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_89",
+        "@id": "http://example.org/IBAL#Jnc4-ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#VAV_3_Connection_2"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#vav3_out_rtd"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 89"
+                "@value": "Jnc4-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_6_OCP",
+        "@id": "http://example.org/IBAL#Junction_27",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#Jnc27-ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc27-OCP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc27-OCP2"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#VAV_4_OCP"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 6 OCP"
+                "@value": "Junction 27"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#CC_1_OCP",
+        "@id": "http://example.org/IBAL#Fan_5_VFD_5",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#CoolingCoil_1"
+                "@id": "http://example.org/IBAL#Fan_5_E_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#VFD_5_OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": " CC 1 OCP"
+                "@value": "Fan 5 VFD 5"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc13-OCP",
+        "@id": "http://example.org/IBAL#Jnc25-OCP2",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "http://example.org/IBAL#Segment_71"
+            }
+        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc13-OCP"
+                "@value": "Jnc25-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#hx1_pg_rtd",
+        "@id": "http://example.org/IBAL#HC_6_W_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/value": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "70"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "hx1_hw_rtd"
+                "@value": "HC 6 W ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_3",
+        "@id": "http://example.org/IBAL#Segment_5",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc3-ICP1"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc3-ICP2"
+                "@id": "http://example.org/IBAL#Damper_5_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc3-OCP"
+                "@id": "http://example.org/IBAL#Jnc2-OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -16040,62 +16088,35 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 3"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#MotorizedDamper_17",
-        "@type": [
-            "http://data.ashrae.org/standard223#Damper"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#Damper_17_ICP"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "Motorized damper 17"
+                "@value": "Segment 5"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#zs2_heat_rtd",
+        "@id": "http://example.org/IBAL#vav4_heat_power",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasValue": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "70"
-            }
-        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
-            }
-        ],
-        "http://qudt.org/schema/qudt/value": [
-            {
-                "@value": "70"
+                "@id": "http://qudt.org/vocab/unit/W"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "zs2 heat rtd"
+                "@value": "vav4 heat power"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc7-OCP2",
+        "@id": "http://example.org/IBAL#Fan_3_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -16104,363 +16125,316 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc7-OCP2"
+                "@value": "Fan 3 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_198",
+        "@id": "http://example.org/IBAL#Jnc35-ICP2",
         "@type": [
-            "http://data.ashrae.org/standard223#FlowSensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_106"
+                "@id": "http://example.org/IBAL#Segment_93"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#ahu2_f_cc_mag"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 198"
+                "@value": "Jnc35-ICP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ReturnAir-1-Flow",
+        "@id": "http://example.org/IBAL#CC_3_W_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasValue": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "500"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/value": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "500"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Return Air 1 Flow"
+                "@value": "CC 3 W ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_44",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Jnc15-ICP"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 44"
+                "@value": "Motorized three way valve 2 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_8",
+        "@id": "http://example.org/IBAL#v8_pos_c",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc8-ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc8-OCP1"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#Jnc8-OCP2"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 8"
+                "@value": "v8 pos c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC-1-InletTemp",
+        "@id": "http://example.org/IBAL#vav3_heat_power",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasValue": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "40"
-            }
-        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
-            }
-        ],
-        "http://qudt.org/schema/qudt/value": [
-            {
-                "@value": "40"
+                "@id": "http://qudt.org/vocab/unit/W"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 1 InletTemp"
+                "@value": "vav3 heat power"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_18",
+        "@id": "http://example.org/IBAL#Channel_335AO",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc18-ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc18-OCP"
-            },
+        "http://data.ashrae.org/standard223#hasObservtaionLocation": [
             {
-                "@id": "http://example.org/IBAL#Jnc18-OCP2"
+                "@id": "http://example.org/IBAL#MotorizedDamper_12"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#d8_pos_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 18"
+                "@value": "Channel 335AO"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_74",
+        "@id": "http://example.org/IBAL#Channel_302T",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc27-OCP1"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_4_ICP"
+                "@id": "http://example.org/IBAL#Segment_4"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#vav2_t_in"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 74"
+                "@value": "Channel 302T"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_88",
+        "@id": "http://example.org/IBAL#Segment_57",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc32-OCP"
+                "@id": "http://example.org/IBAL#Jnc18-OCP2"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc33-ICP1"
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_1_ICP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 88"
+                "@value": "Segment 57"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ManualTwoWayValve_3_OCP",
+        "@id": "http://example.org/IBAL#ahu2_f_sa",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Manual two way valve 3 OCP"
+                "@value": "ahu2 f sa"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VFD_3_ICP",
+        "@id": "http://example.org/IBAL#v12_pos_c",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/bacnet/2020#AnalogOutputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@value": "AHU1 Cooling Coil Valve Control Signal"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
+            {
+                "@value": "analog-output,2"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "VFD 3 ICP"
+                "@value": "v12_pos_c"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Damper_2_ICP",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@value": "analog-output"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#VAV_2_ICP"
+                "@id": "http://example.org/IBAL#AHU_2"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#present-value": [
             {
-                "@value": "Damper 2 ICP"
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "0.0"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Channel_200",
-        "@type": [
-            "http://data.ashrae.org/standard223#FlowSensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#Segment_69"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#pl_f"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 200"
+                "@value": "v12 pos c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_17",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#ThreeWayValve"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#Jnc17-ICP"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_ICP_1"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc17-ICP2"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_ICP_2"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc17-OCP"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 17"
+                "@value": "Motorized three way valve 5"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_heat_rtd",
+        "@id": "http://example.org/IBAL#Channel_123",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://example.org/IBAL#Chiller_2_Lower_Connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://example.org/IBAL#ch2_e_out_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 1 Heat RTD"
+                "@value": "Channel 123"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_8_OCP",
+        "@id": "http://example.org/IBAL#HVAC_Space_4_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#Segment_18"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_8"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 8 OCP"
+                "@value": "HVAC Space 4 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_2_ICP",
+        "@id": "http://example.org/IBAL#Jnc16-ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -16471,157 +16445,108 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 2 ICP"
+                "@value": "Jnc16-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#oau_hs_rtd",
+        "@id": "http://example.org/IBAL#Channel_453",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasValue": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "60"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://example.org/IBAL#VFD_3"
             }
         ],
-        "http://qudt.org/schema/qudt/value": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@value": "60"
+                "@id": "http://example.org/IBAL#exf1_vfd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "oau hs rt"
+                "@value": "Channel 453"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav4_out_rtd",
+        "@id": "http://example.org/IBAL#Junction_18",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "VAV4 Discharge Temperature"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
-            {
-                "@value": "analog-input,2"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
-            {
-                "@value": "vav4_out_rtd"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
-            {
-                "@value": "analog-input"
-            }
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#VAV_4"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+                "@id": "http://example.org/IBAL#Jnc18-ICP"
+            },
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "70.0"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "http://example.org/IBAL#Jnc18-OCP"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://example.org/IBAL#Jnc18-OCP2"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav4 out rtd"
+                "@value": "Junction 18"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc26-OCP",
+        "@id": "http://example.org/IBAL#Junction_15",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_76"
+                "@id": "http://example.org/IBAL#Jnc15-ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc15-OCP1"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc15-OCP2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc26-OCP"
+                "@value": "Junction 15"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_3",
+        "@id": "http://example.org/IBAL#CC_2_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#AirHandlingUnit"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "http://example.org/IBAL#CoolingCoil_3"
-            },
-            {
-                "@id": "http://example.org/IBAL#Fan_5"
-            },
-            {
-                "@id": "http://example.org/IBAL#HeatingCoil_7"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#VFD_5"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#AHU_3_G_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#AHU_3_G_OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#AHU_3_ICP"
-            },
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://example.org/IBAL#AHU_3_OCP"
+                "@id": "http://example.org/IBAL#CoolingCoil_2"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 3"
+                "@value": " CC 2 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#CC_3_W_OCP",
+        "@id": "http://example.org/IBAL#HC_1_W_OCP",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -16632,442 +16557,436 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "CC 3 W OCP"
+                "@value": "HC 1 W OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_105",
+        "@id": "http://example.org/IBAL#ahu1_out_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://example.org/IBAL#AHU_1_G_OCP"
-            },
+                "@value": "AHU1 Supply Air Temperature"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_ICP_1"
+                "@value": "analog-input,2"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@value": "ahu1_out_rtd"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@value": "Segment 105"
+                "@value": "analog-input"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Segment_47",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#Damper_16_OCP"
-            },
+                "@id": "http://example.org/IBAL#AHU_2"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#present-value": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "70.0"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#Jnc16-ICP"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 47"
+                "@value": "AHU 1 Out RTD"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc17-ICP",
+        "@id": "http://example.org/IBAL#Jnc34-OCP1",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc17-ICP"
+                "@value": "Jnc34-OCP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#d10_pos_fb",
+        "@id": "http://example.org/IBAL#Jnc5-ICP1",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d10 pos fb"
+                "@value": "Jnc5-ICP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_10_OCP",
+        "@id": "http://example.org/IBAL#Jnc34-ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 10 OCP"
+                "@value": "Jnc34-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc24-OCP1",
+        "@id": "http://example.org/IBAL#d10_pos_fb",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://qudt.org/vocab/quantitykind/PositionVector"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc24-OCP1"
+                "@value": "d10 pos fb"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc8-OCP2",
+        "@id": "http://example.org/IBAL#HeatingCoil_2",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#HC_2_E_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_2_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_2_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_2_W_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_2_W_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc8-OCP2"
+                "@value": "Heating coil 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#CC_2_Bypass_Connection",
+        "@id": "http://example.org/IBAL#Junction_11",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#connectsAt": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_1_OCP"
+                "@id": "http://example.org/IBAL#Jnc11-ICP1"
             },
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2_ICP_2"
+                "@id": "http://example.org/IBAL#Jnc11-ICP2"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc11-OCP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "CC 2 Bypass Connection"
+                "@value": "Junction 11"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3",
+        "@id": "http://example.org/IBAL#Fan_2_S_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#ThreeWayValve"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_ICP_1"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_ICP_2"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_3_OCP"
+                "@id": "http://data.ashrae.org/standard223#Electricity-Signal"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 3"
+                "@value": "Fan 2 S ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_49",
+        "@id": "http://example.org/IBAL#Channel_193",
         "@type": [
-            "http://data.ashrae.org/standard223#PressureSensor"
+            "http://data.ashrae.org/standard223#FlowSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#AHU_3_Connection_3"
+                "@id": "http://example.org/IBAL#Chiller_1_Lower_Connection"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#oau_p_up"
+                "@id": "http://example.org/IBAL#ch1_f_e"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 49"
+                "@value": "Channel 193"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_ICP_2",
+        "@id": "http://example.org/IBAL#exf2_vfd",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 5 ICP 2"
+                "@value": "exf2 vfd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_39",
+        "@id": "http://example.org/IBAL#Damper_17_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#HumiditySensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_16"
+                "@id": "http://example.org/IBAL#MotorizedDamper_17"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#zs3_rh"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_17"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 39"
+                "@value": "Damper 17 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_OCP",
+        "@id": "http://example.org/IBAL#HC_7_E_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized three way valve 1 OCP"
+                "@value": "HC 7 E ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_21",
+        "@id": "http://example.org/IBAL#Channel_411",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc21-ICP1"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc21-ICP2"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Jnc21-OCP"
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_2"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#v13_pos_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 21"
+                "@value": "Channel 411"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_fan_power",
+        "@id": "http://example.org/IBAL#Fan_1_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/W"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU1 Fan Power"
+                "@value": "Fan 1 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_12",
+        "@id": "http://example.org/IBAL#vav3_out_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#HVAC_Space_1_OCP"
-            },
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://example.org/IBAL#Jnc5-ICP1"
+                "@value": "VAV3 Discharge Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@value": "analog-input,89"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "Segment 12"
+                "@value": "VAV3-T"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#MotorizedDamper_11",
-        "@type": [
-            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@id": "http://example.org/IBAL#Damper_11_ICP"
-            },
+                "@value": "analog-input"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#Damper_11_OCP"
+                "@id": "http://example.org/IBAL#VAV_3"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#present-value": [
             {
-                "@value": "Motorized damper 11"
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "55.0"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Channel_364AO",
-        "@type": [
-            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_4"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#d18_pos_c"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 364AO"
+                "@value": "vav3 out rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#exf2_power",
+        "@id": "http://example.org/IBAL#Segment_32",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://example.org/IBAL#Damper_7_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc11-ICP2"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/W"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "exf2 power"
+                "@value": "Segment 32"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_84",
+        "@id": "http://example.org/IBAL#Channel_403",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#Controller"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#AHU_3_Connection_2"
+                "@id": "http://example.org/IBAL#HeatingCoil_5"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#oau_cc_rtd"
+                "@id": "http://example.org/IBAL#vav3_heat_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 84"
+                "@value": "Channel 403"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_364",
+        "@id": "http://example.org/IBAL#Jnc4-OCP1",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_4"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#d18_pos_fb"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 364"
+                "@value": "Jnc4-OCP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ManualTwoWayValve_2_ICP",
+        "@id": "http://example.org/IBAL#WaterPump_2_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -17076,188 +16995,219 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Manual two way valve 2 ICP"
+                "@value": "Water pump 2 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_401",
+        "@id": "http://example.org/IBAL#ahu2_p_down",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://example.org/IBAL#HeatingCoil_2"
+                "@value": "Static Pressure Measurement Downstream Fan"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://example.org/IBAL#vav1_heat_c"
+                "@value": "analog-input,3"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-name": [
+            {
+                "@value": "ahu2_p_down"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-type": [
+            {
+                "@value": "analog-input"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
+            {
+                "@id": "http://example.org/IBAL#AHU_1"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#present-value": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "0.0"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PA"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 401"
+                "@value": "ahu2 p down"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ManualTwoWayValve_5",
+        "@id": "http://example.org/IBAL#Segment_13",
         "@type": [
-            "http://data.ashrae.org/standard223#TwoWayValve"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_5_ICP"
+                "@id": "http://example.org/IBAL#Jnc19-OCP"
             },
             {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_5_OCP"
+                "@id": "http://example.org/IBAL#ManualTwoWayValve_2_ICP"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Manual two way valve 5"
+                "@value": "Segment 13"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_402",
+        "@id": "http://example.org/IBAL#Channel_13",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#PressureSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#HeatingCoil_3"
+                "@id": "http://example.org/IBAL#Segment_27"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#vav2_heat_c"
+                "@id": "http://example.org/IBAL#exf1_p_up"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 402"
+                "@value": "Channel 13"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc28-ICP",
+        "@id": "http://example.org/IBAL#CC_2_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+            {
+                "@id": "http://example.org/IBAL#CoolingCoil_2"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc28-ICP"
+                "@value": "CC 2 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_4_Connection_2",
+        "@id": "http://example.org/IBAL#Damper_4_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#HVAC_Space_4_ICP"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#VAV_4_OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#VAV_4_ICP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV 4 Connection 2"
+                "@value": "Damper 4 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_14",
+        "@id": "http://example.org/IBAL#Channel_52",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#ElectricMeter"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc14-ICP1"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc14-ICP2"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Jnc14-OCP"
+                "@id": "http://example.org/IBAL#WaterChiller_1"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#ch1_power"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 14"
+                "@value": "Channel 52"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_425",
+        "@id": "http://example.org/IBAL#Junction_30",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_8"
+                "@id": "http://example.org/IBAL#Jnc30-ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc30-ICP2"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc30-OCP"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#d10_pos_c"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 425"
+                "@value": "Junction 30"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_3_ICP",
+        "@id": "http://example.org/IBAL#HC_6_E_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV 3 ICP"
+                "@value": "HC 6 E ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VAV_2_Connection_2",
+        "@id": "http://example.org/IBAL#Segment_39",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#HVAC_Space_2_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#VAV_2_OCP"
-            }
-        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
@@ -17265,815 +17215,847 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV 2 Connection 2"
+                "@value": "Segment 39"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_2_G_ICP",
+        "@id": "http://example.org/IBAL#exf2_power",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#Segment_56"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://qudt.org/vocab/unit/W"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 2 G ICP"
+                "@value": "exf2 power"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HVACSpace_1",
+        "@id": "http://example.org/IBAL#HVAC_Space_1_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#HVAC_Space_1_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#HVAC_Space_1_OCP"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://example.org/IBAL#Segment_12"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#zs1_t_sp_f"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HVACSpace 1"
+                "@value": "HVAC Space1 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Chiller_2_Upper_OCP",
+        "@id": "http://example.org/IBAL#CoolingCoil_3",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#CoolingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
+                "@id": "http://example.org/IBAL#CC_3_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#CC_3_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#CC_3_W_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#CC_3_W_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Chiller 2 Upper OCP"
+                "@value": "Cooling coil 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ManualTwoWayValve_2",
+        "@id": "http://example.org/IBAL#HC_2_W_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#TwoWayValve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_2_ICP"
-            },
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_2_OCP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Manual two way valve 2"
+                "@value": "HC 2 W OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_60",
+        "@id": "http://example.org/IBAL#Damper_13_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#ElectricMeter"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#VFD_1"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://example.org/IBAL#ahu2_fan_power"
+                "@id": "http://example.org/IBAL#MotorizedDamper_13"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 60"
+                "@value": "Damper 13 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#zs4_rh",
+        "@id": "http://example.org/IBAL#HVACZone_4",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasValue": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "30"
-            }
+            "http://data.ashrae.org/standard223#Zone"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasDomainSpace": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://example.org/IBAL#HVACSpace_4"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "zsh4 rh"
+                "@value": "HVACZone 4"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_326",
+        "@id": "http://example.org/IBAL#Channel_450",
         "@type": [
-            "http://data.ashrae.org/standard223#FlowSensor"
+            "http://data.ashrae.org/standard223#Controller"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Segment_38"
+                "@id": "http://example.org/IBAL#VFD_2"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#ahu1_f_sa"
+                "@id": "http://example.org/IBAL#ahu1_vfd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 326"
+                "@value": "Channel 450"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_52",
+        "@id": "http://example.org/IBAL#d11_pos_c",
         "@type": [
-            "http://data.ashrae.org/standard223#ElectricMeter"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#WaterChiller_1"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#ch1_power"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 52"
+                "@value": "d11 pos c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#WaterPump_1",
+        "@id": "http://example.org/IBAL#HeatingCoil_1",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#WaterPump_1_ICP"
+                "@id": "http://example.org/IBAL#HC_1_E_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#WaterPump_1_OCP"
+                "@id": "http://example.org/IBAL#HC_1_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_1_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_1_W_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_1_W_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Water pump 1"
+                "@value": "Heating coil 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_94",
+        "@id": "http://example.org/IBAL#VFD_2_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc34-OCP2"
-            },
-            {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_4_ICP_2"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 94"
+                "@value": "VFD 2 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_65",
+        "@id": "http://example.org/IBAL#ch1_power",
         "@type": [
-            "http://data.ashrae.org/standard223#ElectricMeter"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#HeatingCoil_5"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#vav3_heat_power"
+                "@id": "http://qudt.org/vocab/unit/W"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 65"
+                "@value": "ch1 power"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_20",
+        "@id": "http://example.org/IBAL#Damper_6_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Damper_12_ICP"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Jnc7-OCP1"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#MotorizedDamper_6"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 20"
+                "@value": "Damper 6 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#WaterPump_4",
+        "@id": "http://example.org/IBAL#Channel_62",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#ElectricMeter"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#WaterPump_4_ICP"
-            },
+                "@id": "http://example.org/IBAL#HeatingCoil_1"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#WaterPump_4_OCP"
+                "@id": "http://example.org/IBAL#ahu2_heat_power"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Water pump 4"
+                "@value": "Channel 62"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5",
+        "@id": "http://example.org/IBAL#AHU2_FnB",
         "@type": [
-            "http://data.ashrae.org/standard223#ThreeWayValve"
+            "http://data.ashrae.org/standard223#FunctionBlock"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasInput": [
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_ICP_1"
+                "@id": "http://example.org/IBAL#ahu1_out_rtd"
             },
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_ICP_2"
+                "@id": "http://example.org/IBAL#ahu1_p_down"
             },
             {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_OCP"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "http://example.org/IBAL#d17_pos_c"
+            },
             {
-                "@value": "Motorized three way valve 5"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Junction_4",
-        "@type": [
-            "http://data.ashrae.org/standard223#Junction"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+                "@id": "http://example.org/IBAL#d18_pos_c"
+            },
             {
-                "@id": "http://example.org/IBAL#Jnc4-ICP"
+                "@id": "http://example.org/IBAL#v12_pos_fb"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc4-OCP1"
+                "@id": "http://example.org/IBAL#vav3_heat_c"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc4-OCP2"
+                "@id": "http://example.org/IBAL#vav4_heat_c"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasOutput": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#ahu1_vfd"
+            },
+            {
+                "@id": "http://example.org/IBAL#v12_pos_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 4"
+                "@value": "AHU2 Fn b"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#hx3_pg_rtd",
+        "@id": "http://example.org/IBAL#Channel_10",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#HumiditySensor"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://example.org/IBAL#Segment_1"
             }
         ],
-        "http://qudt.org/schema/qudt/value": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@value": "72"
+                "@id": "http://example.org/IBAL#ahu2_rh_down"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "hx1 pg rtd"
+                "@value": "Channel 10"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav3_out_rtd",
+        "@id": "http://example.org/IBAL#Fan_2",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Fan"
         ],
-        "http://data.ashrae.org/bacnet/2020#description": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "VAV3 Discharge Temperature"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
+                "@id": "http://example.org/IBAL#Fan_2_ICP"
+            },
             {
-                "@value": "analog-input,89"
+                "@id": "http://example.org/IBAL#Fan_2_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Fan_2_S_ICP"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VAV3-T"
+                "@value": "Fan 2"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#ch2_e_out_rtd",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "analog-input"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#VAV_3"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "55.0"
+                "@value": "ch2 e out rtd"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#VAV_4_Connection_2",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://example.org/IBAL#HVAC_Space_4_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#VAV_4_OCP"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_F"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav3 out rtd"
+                "@value": "VAV 4 Connection 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_rh_up",
+        "@id": "http://example.org/IBAL#Segment_103",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasValue": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "60"
+                "@id": "http://example.org/IBAL#AHU_1_G_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc19-OCP2"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@value": "Segment 103"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#VFD_5_OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/value": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "60"
+                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 1 RH Up"
+                "@value": "VFD 5 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_302T",
+        "@id": "http://example.org/IBAL#Segment_1",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Segment_4"
+                "@id": "http://example.org/IBAL#AHU_1_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Jnc1-ICP"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#vav2_t_in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 302T"
+                "@value": "Segment 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#d17_pos_c",
+        "@id": "http://example.org/IBAL#Jnc12-ICP",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogOutputObject",
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/bacnet/2020#description": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "VAV3 Damper Control Signal"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "analog-output,2"
+                "@value": "Jnc12-ICP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#MotorizedDamper_7",
+        "@type": [
+            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "d17_pos_c"
+                "@id": "http://example.org/IBAL#Damper_7_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Damper_7_OCP"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "analog-output"
+                "@value": "Motorized damper 7"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Jnc2-OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#VAV_3"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "0.0"
+                "@value": "Jnc2-OCP"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Channel_38",
+        "@type": [
+            "http://data.ashrae.org/standard223#HumiditySensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://example.org/IBAL#Segment_14"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://example.org/IBAL#zs2_rh"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d17 pos c"
+                "@value": "Channel 38"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_7",
+        "@id": "http://example.org/IBAL#v8_pos_fb",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc7-ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc7-OCP1"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#Jnc7-OCP2"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 7"
+                "@value": "v8 pos fb"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_7_ICP",
+        "@id": "http://example.org/IBAL#Jnc27-OCP2",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
-            {
-                "@id": "http://example.org/IBAL#MotorizedDamper_7"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 7 ICP"
+                "@value": "Jnc27-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#PlateHeatExchanger_2",
+        "@id": "http://example.org/IBAL#VFD_1",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatExchanger"
+            "http://data.ashrae.org/standard223#VariableFrequencyDrive"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://example.org/IBAL#PlateHeatExchange_2_Lower_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#PlateHeatExchange_2_Lower_OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#PlateHeatExchange_2_Upper_ICP"
+                "@id": "http://example.org/IBAL#VFD_1_ICP"
             },
             {
-                "@id": "http://example.org/IBAL#PlateHeatExchange_2_Upper_OCP"
+                "@id": "http://example.org/IBAL#VFD_1_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Plate heat exchanger 1"
+                "@value": "VFD 1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_1_S_ICP",
+        "@id": "http://example.org/IBAL#Jnc20-OCP2",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Electricity-Signal"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 1 S ICP"
+                "@value": "Jnc20-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_5_ICP",
+        "@id": "http://example.org/IBAL#Chiller_2_Lower_Connection",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#connectsAt": [
+            {
+                "@id": "http://example.org/IBAL#Chiller_2_Lower_OCP"
+            },
+            {
+                "@id": "http://example.org/IBAL#WaterPump_3_ICP"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 5 ICP"
+                "@value": "Chiller 2 Lower Connection"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_6_OCP",
+        "@id": "http://example.org/IBAL#Jnc29-OCP2",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#Fan_3_ICP"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@value": "Jnc29-OCP2"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#CC_3_W_OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_6"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 6 OCP"
+                "@value": "CC 3 W OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_5_VFD_5",
+        "@id": "http://example.org/IBAL#Channel_87",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Fan_5_E_ICP"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#VFD_5_OCP"
+                "@id": "http://example.org/IBAL#VAV_1_Connection_2"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://example.org/IBAL#vav1_out_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 5 VFD 5"
+                "@value": "Channel 87"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_6",
+        "@id": "http://example.org/IBAL#Channel_49",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#PressureSensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#Jnc6-ICP1"
-            },
+                "@id": "http://example.org/IBAL#AHU_3_Connection_3"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#Jnc6-ICP2"
-            },
+                "@id": "http://example.org/IBAL#oau_p_up"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://example.org/IBAL#Jnc6-OCP"
+                "@value": "Channel 49"
             }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#HC_6_W_OCP",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 6"
+                "@value": "HC 6 W OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#d11_pos_c",
+        "@id": "http://example.org/IBAL#VAV_1_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d11 pos c"
+                "@value": "VAV 1 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_111",
+        "@id": "http://example.org/IBAL#CC_3_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#HVAC_Space_4_ICP"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://example.org/IBAL#zs4_heat_rtd"
+                "@id": "http://example.org/IBAL#AHU_3_ICP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 111"
+                "@value": "CC 3 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc17-ICP2",
+        "@id": "http://example.org/IBAL#ahu1_heat_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc17-ICP2"
+                "@value": "AHU 1 Heat RTD"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_90",
+        "@id": "http://example.org/IBAL#VAV_2_Connection_2",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#Connection"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#VAV_4_Connection_2"
+                "@id": "http://example.org/IBAL#HVAC_Space_2_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#VAV_2_OCP"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#vav4_out_rtd"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 90"
+                "@value": "VAV 2 Connection 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#vav2_f",
+        "@id": "http://example.org/IBAL#d15_pos_c",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/bacnet/2020#AnalogOutputObject",
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@value": "VAV2 Airflow Rate"
+                "@value": "VAV1 Damper Control Signal"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@value": "analog-input,4"
+                "@value": "analog-output,2"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@value": "vav2_f"
+                "@value": "d15_pos_c"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@value": "analog-input"
+                "@value": "analog-output"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#VAV_2"
+                "@id": "http://example.org/IBAL#VAV_1"
             }
         ],
         "http://data.ashrae.org/bacnet/2020#present-value": [
@@ -18084,86 +18066,112 @@
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "vav2 f"
+                "@value": "d15 pos c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_36",
+        "@id": "http://example.org/IBAL#Channel_364AO",
+        "@type": [
+            "http://data.ashrae.org/standard223#Controller"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_4"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "http://example.org/IBAL#d18_pos_c"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "Channel 364AO"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/IBAL#Junction_12",
         "@type": [
             "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc36-ICP"
+                "@id": "http://example.org/IBAL#Jnc12-ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc36-OCP1"
+                "@id": "http://example.org/IBAL#Jnc12-OCP1"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc36-OCP2"
+                "@id": "http://example.org/IBAL#Jnc12-OCP2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 36"
+                "@value": "Junction 12"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#AHU_1_ICP",
+        "@id": "http://example.org/IBAL#HeatExchange",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
+            }
+        ],
+        "http://qudt.org/schema/qudt/value": [
+            {
+                "@value": "60"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "AHU 1 ICP"
+                "@value": "HeatExchange"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_456",
+        "@id": "http://example.org/IBAL#Jnc32-ICP1",
         "@type": [
-            "http://data.ashrae.org/standard223#Controller"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#v8_pos_c"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 456"
+                "@value": "Jnc32-ICP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc33-OCP",
+        "@id": "http://example.org/IBAL#Jnc24-OCP2",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -18174,12 +18182,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc33-OCP"
+                "@value": "Jnc24-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc2-ICP",
+        "@id": "http://example.org/IBAL#Damper_14_ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -18188,196 +18196,243 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+            {
+                "@id": "http://example.org/IBAL#MotorizedDamper_14"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc2-ICP"
+                "@value": "Damper 14 ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_7_E_ICP",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+            {
+                "@id": "http://example.org/IBAL#MotorizedThreeWayValve_5"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 7 E ICP"
+                "@value": "Motorized three way valve 5 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HC_3_E_ICP",
+        "@id": "http://example.org/IBAL#Jnc20-ICP",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HC 3 E ICP"
+                "@value": "Jnc20-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#exf1_power",
+        "@id": "http://example.org/IBAL#Channel_402",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Controller"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Power"
+                "@id": "http://example.org/IBAL#HeatingCoil_3"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/W"
+                "@id": "http://example.org/IBAL#vav2_heat_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "exf1 power"
+                "@value": "Channel 402"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_86",
+        "@id": "http://example.org/IBAL#Enclosure_2",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc27-OCP2"
-            },
-            {
-                "@id": "http://example.org/IBAL#ManualTwoWayValve_5_ICP"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#HVACSpace_2"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 86"
+                "@value": "Enclosure 2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Exhaust_Fan_1_Connection_2",
+        "@id": "http://example.org/IBAL#vav1_heat_c",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/bacnet/2020#AnalogOutputObject",
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://data.ashrae.org/bacnet/2020#description": [
+            {
+                "@value": "VAV1 Heater Control Signal"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
+            {
+                "@value": "analog-output,1"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-name": [
+            {
+                "@value": "vav1_heat_c"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-type": [
+            {
+                "@value": "analog-output"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
+            {
+                "@id": "http://example.org/IBAL#VAV_1"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#present-value": [
+            {
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "0.0"
+            }
         ],
-        "http://data.ashrae.org/standard223#connectsAt": [
-            {
-                "@id": "http://example.org/IBAL#Damper_7_ICP"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#Fan_3_OCP"
+                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Exhaust Fan 1 Connection 2"
+                "@value": "vav1 heat c"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc16-ICP",
+        "@id": "http://example.org/IBAL#MotorizedThreeWayValve_1_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc16-ICP"
+                "@value": "Motorized three way valve 1 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc20-OCP",
+        "@id": "http://example.org/IBAL#AHU_3_Connection_3",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection"
+        ],
+        "http://data.ashrae.org/standard223#connectsAt": [
+            {
+                "@id": "http://example.org/IBAL#Fan_5_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#HC_7_OCP"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc20-OCP"
+                "@value": "AHU 3 Connection 3"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_325",
+        "@id": "http://example.org/IBAL#hx3_pg_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#FlowSensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#Segment_23"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#ahu1_f_ra"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
+            }
+        ],
+        "http://qudt.org/schema/qudt/value": [
+            {
+                "@value": "72"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 325"
+                "@value": "hx1 pg rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_5_ICP",
+        "@id": "http://example.org/IBAL#MotorizedDamper_18",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#Damper_18_ICP"
+            },
+            {
+                "@id": "http://example.org/IBAL#Damper_18_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 5 ICP"
+                "@value": "Motorized damper 18"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_32",
+        "@id": "http://example.org/IBAL#Junction_38",
         "@type": [
             "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc32-ICP1"
+                "@id": "http://example.org/IBAL#Jnc38-ICP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc32-ICP2"
+                "@id": "http://example.org/IBAL#Jnc38-OCP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc32-OCP"
+                "@id": "http://example.org/IBAL#Jnc38-OCP2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -18387,101 +18442,62 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 32"
+                "@value": "Junction 38"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Hydronic",
+        "@id": "http://example.org/IBAL#Jnc15-ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#System"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMember": [
-            {
-                "@id": "http://example.org/IBAL#CoolingCoil_1"
-            },
-            {
-                "@id": "http://example.org/IBAL#CoolingCoil_2"
-            },
-            {
-                "@id": "http://example.org/IBAL#PlateHeatExchanger_1"
-            },
-            {
-                "@id": "http://example.org/IBAL#PlateHeatExchanger_2"
-            },
-            {
-                "@id": "http://example.org/IBAL#ThermalStorage_1"
-            },
-            {
-                "@id": "http://example.org/IBAL#WaterChiller_1"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#WaterChiller_2"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Hydronic"
+                "@value": "Jnc15-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_109",
+        "@id": "http://example.org/IBAL#Channel_65",
         "@type": [
-            "http://data.ashrae.org/standard223#TemperatureSensor"
+            "http://data.ashrae.org/standard223#ElectricMeter"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#HVAC_Space_3_ICP"
+                "@id": "http://example.org/IBAL#HeatingCoil_5"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#zs3_heat_rtd"
+                "@id": "http://example.org/IBAL#vav3_heat_power"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 109"
+                "@value": "Channel 65"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#ahu1_f_cc",
+        "@id": "http://example.org/IBAL#Junction_14",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasValue": [
-            {
-                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-                "@value": "40"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/unit/GAL_US-PER-MIN"
-            }
-        ],
-        "http://qudt.org/schema/qudt/value": [
+                "@id": "http://example.org/IBAL#Jnc14-ICP1"
+            },
             {
-                "@value": "40"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "http://example.org/IBAL#Jnc14-ICP2"
+            },
             {
-                "@value": "Channel 197"
+                "@id": "http://example.org/IBAL#Jnc14-OCP"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Jnc3-ICP1",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -18490,69 +18506,55 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc3-ICP1"
+                "@value": "Junction 14"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc31-ICP2",
+        "@id": "http://example.org/IBAL#Channel_6",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
-            }
+            "http://data.ashrae.org/standard223#HumiditySensor"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "Jnc31-ICP2"
+                "@id": "http://example.org/IBAL#Segment_9"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Jnc36-ICP",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://example.org/IBAL#ahu1_rh_down"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc36-ICP"
+                "@value": "Channel 6"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Fan_5_E_ICP",
+        "@id": "http://example.org/IBAL#Jnc31-ICP2",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Fan 5 E ICP"
+                "@value": "Jnc31-ICP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_103",
+        "@id": "http://example.org/IBAL#Jnc23-ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#AHU_1_G_ICP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc19-OCP2"
+                "@id": "http://example.org/IBAL#Segment_62"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -18562,317 +18564,310 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 103"
+                "@value": "Jnc23-ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Junction_11",
+        "@id": "http://example.org/IBAL#Segment_76",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc11-ICP1"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc11-ICP2"
+                "@id": "http://example.org/IBAL#Jnc26-OCP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc11-OCP"
+                "@id": "http://example.org/IBAL#Jnc28-ICP"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 11"
+                "@value": "Segment 76"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_78",
+        "@id": "http://example.org/IBAL#Channel_75",
         "@type": [
             "http://data.ashrae.org/standard223#TemperatureSensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://example.org/IBAL#AHU_1_Connection_2"
+                "@id": "http://example.org/IBAL#AHU_2_Connection_3"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#ahu2_heat_rtd"
+                "@id": "http://example.org/IBAL#ahu1_cc_rtd"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 78"
+                "@value": "Channel 75"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#d15_pos_fb",
+        "@id": "http://example.org/IBAL#oau_hs_rtd",
         "@type": [
-            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/bacnet/2020#description": [
-            {
-                "@value": "VAV1 Damper Feedback Signal"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-identifier": [
-            {
-                "@value": "analog-input,1"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-name": [
-            {
-                "@value": "d15_pos_fb"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#object-type": [
-            {
-                "@value": "analog-input"
-            }
-        ],
-        "http://data.ashrae.org/bacnet/2020#objectOf": [
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@id": "http://example.org/IBAL#VAV_1"
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "60"
             }
         ],
-        "http://data.ashrae.org/bacnet/2020#present-value": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@type": "http://www.w3.org/2001/XMLSchema#float",
-                "@value": "0.0"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Voltage"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://qudt.org/schema/qudt/value": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@value": "60"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "d15 pos fb"
+                "@value": "oau hs rt"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc22-OCP1",
+        "@id": "http://example.org/IBAL#VAV2_FnB",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#FunctionBlock"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasInput": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "http://example.org/IBAL#d16_pos_fb"
+            },
             {
-                "@value": "Jnc22-OCP1"
+                "@id": "http://example.org/IBAL#vav2_f"
+            },
+            {
+                "@id": "http://example.org/IBAL#vav2_out_rtd"
+            },
+            {
+                "@id": "http://example.org/IBAL#vav2_t_in"
+            },
+            {
+                "@id": "http://example.org/IBAL#zs2_out_rtd"
+            },
+            {
+                "@id": "http://example.org/IBAL#zs2_t_sp_f"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Jnc4-OCP1",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasOutput": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#d16_pos_c"
+            },
+            {
+                "@id": "http://example.org/IBAL#vav2_heat_c"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc4-OCP1"
+                "@value": "VAV2 Fn b"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_52",
+        "@id": "http://example.org/IBAL#Channel_60",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/standard223#ElectricMeter"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://example.org/IBAL#VFD_1"
             }
         ],
-        "http://data.ashrae.org/standard223#lnx": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://example.org/IBAL#AHU_3_ICP"
+                "@id": "http://example.org/IBAL#ahu2_fan_power"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 52"
+                "@value": "Channel 60"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Damper_19_ICP",
+        "@id": "http://example.org/IBAL#HC-3-OutletFlow",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_19"
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "500"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
-        "http://data.ashrae.org/standard223#isConnectionPointOf": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#MotorizedDamper_19"
+                "@id": "http://qudt.org/vocab/unit/PA"
+            }
+        ],
+        "http://qudt.org/schema/qudt/value": [
+            {
+                "@value": "500"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Damper 19 ICP"
+                "@value": "HC 3 OutletFlow"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_6",
+        "@id": "http://example.org/IBAL#AHU_2_S_ICP",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Damper_5_OCP"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc3-ICP1"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Electricity-Signal"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 6"
+                "@value": "AHU 2 S ICP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#MotorizedDamper_2",
+        "@id": "http://example.org/IBAL#zs2_heat_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasValue": [
             {
-                "@id": "http://example.org/IBAL#Damper_2_ICP"
-            },
+                "@type": "http://www.w3.org/2001/XMLSchema#decimal",
+                "@value": "70"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#Damper_2_OCP"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
+            }
+        ],
+        "http://qudt.org/schema/qudt/value": [
+            {
+                "@value": "70"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Motorized damper 2"
+                "@value": "zs2 heat rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Channel_72",
+        "@id": "http://example.org/IBAL#ahu2_heat_rtd",
         "@type": [
-            "http://data.ashrae.org/standard223#ElectricMeter"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://example.org/IBAL#VFD_4"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://example.org/IBAL#exf2_power"
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Channel 72"
+                "@value": "ahu2 heat rtd"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_78",
+        "@id": "http://example.org/IBAL#zs2_t_sp_f",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
+            "http://data.ashrae.org/bacnet/2020#AnalogInputObject",
+            "http://data.ashrae.org/standard223#QuantifiableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/bacnet/2020#description": [
             {
-                "@id": "http://example.org/IBAL#Chiller_1_Lower_ICP"
-            },
+                "@value": "Zone2 Temperature Setpoint"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#object-identifier": [
             {
-                "@id": "http://example.org/IBAL#Jnc28-OCP2"
+                "@value": "analog-input,6"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/bacnet/2020#object-name": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@value": "zs2_t_sp_f"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/bacnet/2020#object-type": [
             {
-                "@value": "Segment 78"
+                "@value": "analog-input"
             }
-        ]
-    },
-    {
-        "@id": "http://example.org/IBAL#Junction_15",
-        "@type": [
-            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/bacnet/2020#objectOf": [
             {
-                "@id": "http://example.org/IBAL#Jnc15-ICP"
-            },
+                "@id": "http://example.org/IBAL#VAV_2"
+            }
+        ],
+        "http://data.ashrae.org/bacnet/2020#present-value": [
             {
-                "@id": "http://example.org/IBAL#Jnc15-OCP1"
-            },
+                "@type": "http://www.w3.org/2001/XMLSchema#float",
+                "@value": "74.0"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://example.org/IBAL#Jnc15-OCP2"
+                "@id": "http://data.ashrae.org/standard223#Aspect-Setpoint"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_F"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Junction 15"
+                "@value": "zs2 t sp f"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_95",
+        "@id": "http://example.org/IBAL#Jnc25-OCP1",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "http://example.org/IBAL#Jnc24-OCP2"
-            },
-            {
-                "@id": "http://example.org/IBAL#Jnc35-ICP1"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -18881,52 +18876,57 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 95"
+                "@value": "Jnc25-OCP1"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#VFD_5_ICP",
+        "@id": "http://example.org/IBAL#Fan_2_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Electricity"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "http://example.org/IBAL#AHU_2_OCP"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "VFD 5 ICP"
+                "@value": "Fan 2 OCP"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Segment_62",
+        "@id": "http://example.org/IBAL#Segment_50",
         "@type": [
             "http://data.ashrae.org/standard223#Connection"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://example.org/IBAL#Jnc21-OCP"
+                "@id": "http://example.org/IBAL#Damper_18_OCP"
             },
             {
-                "@id": "http://example.org/IBAL#Jnc23-ICP"
+                "@id": "http://example.org/IBAL#Jnc17-ICP2"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-GlycolSolution"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Segment 62"
+                "@value": "Segment 50"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#Jnc34-OCP1",
+        "@id": "http://example.org/IBAL#Jnc22-OCP2",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -18937,28 +18937,28 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "Jnc34-OCP1"
+                "@value": "Jnc22-OCP2"
             }
         ]
     },
     {
-        "@id": "http://example.org/IBAL#HVACZone_1",
+        "@id": "http://example.org/IBAL#VAV_1_OCP",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://example.org/IBAL#VAV_1_Connection_2"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomainSpace": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://example.org/IBAL#HVACSpace_1"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "HVACZone 1"
+                "@value": "VAV 1 OCP"
             }
         ]
     }
diff --git a/lbnl-example.jsonld b/lbnl-example.jsonld
index f63f66a4..f85ca4cf 100644
--- a/lbnl-example.jsonld
+++ b/lbnl-example.jsonld
@@ -1,12 +1,28 @@
 [
     {
-        "@id": "urn:ex/vav-510-damper-out",
+        "@id": "urn:ex/vav-538-discharge-air-flow-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:ex/vav-538-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-538-discharge-air-flow"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-509-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-510-duct-after-damper"
+                "@id": "urn:ex/connection-to-room-113"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -16,59 +32,48 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-510-colder-supply-air-requests"
+                "@id": "urn:ex/vav-509-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-510-cooling-pid-output"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-hot-water-out-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-509-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-509-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-509-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-discharge-air-flow-setpoint",
+        "@id": "urn:ex/zone-213-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-106-107-occupancy-sensor",
+        "@id": "urn:ex/zone-113-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/room-106-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/zone-106-107-occupancy"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-hot-water-in-connection",
+        "@id": "urn:ex/vav-534-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -80,26 +85,38 @@
         ]
     },
     {
-        "@id": "urn:ex/room-213-out",
+        "@id": "urn:ex/vav-515-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-515-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-515-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-515-cooling-pid-output"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-hot-water-out-connection",
+        "@id": "urn:ex/vav-516-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-516-pipe-hot-water-return-before-valve"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -108,30 +125,37 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-307-308-heating-setpoint",
+        "@id": "urn:ex/vav-508-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-524-heating-pid-output",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-valve-in",
+        "@id": "urn:ex/office-ahu-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-532-pipe-hot-water-return-before-valve"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -140,9 +164,9 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-118-cooling-setpoint",
+        "@id": "urn:ex/zone-312-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -156,14 +180,26 @@
         ]
     },
     {
-        "@id": "urn:ex/room-305-out",
+        "@id": "urn:ex/vav-526-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-526-hot-water-in-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-540-duct-after-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -172,34 +208,34 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-525-heating-pid-output",
+        "@id": "urn:ex/zone-108-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/room-108-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/zone-108-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-106-107-occupancy",
+        "@id": "urn:ex/vav-517-more-heat-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-312-occupancy",
+        "@id": "urn:ex/zone-101-occupancy",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -210,203 +246,225 @@
         ]
     },
     {
-        "@id": "urn:ex/room-206-out",
+        "@id": "urn:ex/vav-522-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-522-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-522-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-301-temp",
+        "@id": "urn:ex/vav-519-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/connection-to-room-204-205"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-519-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-519-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-519-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-519-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-heating-pid-output",
+        "@id": "urn:ex/vav-511-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520",
+        "@id": "urn:ex/vav-533-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-520-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-520-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-520-hot-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-520-hot-water-out"
+                "@id": "urn:ex/vav-533-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-520-damper"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-520-reheat-coil"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-520-reheat-coil-valve"
+                "@id": "urn:ex/vav-533-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-103-occupancy-sensor",
+        "@id": "urn:ex/vav-529-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-103-hvac-domain"
+                "@id": "urn:ex/vav-529-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-103-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-air-out",
+        "@id": "urn:ex/vav-534-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-301"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-503-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-527-discharge-air-flow"
+                "@id": "urn:ex/vav-503-damper-in"
             },
             {
-                "@id": "urn:ex/vav-527-discharge-air-flow-setpoint"
-            },
+                "@id": "urn:ex/vav-503-damper-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-527-discharge-air-temp"
+                "@id": "urn:ex/vav-503-damper-command"
             },
             {
-                "@id": "urn:ex/vav-527-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-503-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-534-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-534-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-534-damper-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-534-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-534-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-305-window-switch-on-off",
+        "@id": "urn:ex/vav-501-more-heat-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-discharge-air-flow-sensor",
+        "@id": "urn:ex/zone-102-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-515-air-in"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-515-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-211-occupancy",
+        "@id": "urn:ex/office-ahu-ra-fan-start-cmd",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-hot-water-in",
+        "@id": "urn:ex/zone-204-205-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-533-hot-water-in-connection"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-526-duct-after-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-more-heat-requests",
+        "@id": "urn:ex/vav-536-more-heat-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -417,26 +475,49 @@
         ]
     },
     {
-        "@id": "urn:ex/room-307-in",
+        "@id": "urn:ex/vav-538-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-539-damper-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-307-308"
+                "@id": "urn:ex/vav-539-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-539-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-539-cooling-pid-output"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-hot-water-out-connection",
+        "@id": "urn:ex/vav-519-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-519-hot-water-in-connection"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -445,104 +526,121 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-507-damper",
+        "@id": "urn:ex/vav-524-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-507-damper-in"
-            },
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-507-damper-out"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-507-damper-command"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-507-damper-position"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-211-in",
+        "@id": "urn:ex/vav-536-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-211"
+                "@id": "urn:ex/vav-536-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-536-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-536-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-536-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-118-temp-sensor",
+        "@id": "urn:ex/vav-504-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/room-118-hvac-domain"
+                "@id": "urn:ex/vav-504-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/zone-118-temp"
+                "@id": "urn:ex/vav-504-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-damper-out",
+        "@id": "urn:ex/office-ahu-pipe-chilled-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-526-duct-after-damper"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-512-reheat-coil-valve-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-512-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-526-colder-supply-air-requests"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-526-cooling-pid-output"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-cooling-pid-output",
+        "@id": "urn:ex/vav-509-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-509-hot-water-in-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-509-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-damper-command",
+        "@id": "urn:ex/vav-516-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -556,61 +654,59 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-522-reheat-coil-valve-position",
+        "@id": "urn:ex/zone-215-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-reheat-coil-valve-actuator",
+        "@id": "urn:ex/zone-202-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-501-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-501-reheat-coil-valve-command"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil-valve-in",
+        "@id": "urn:ex/room-114-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-524-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/room-114-in"
+            },
+            {
+                "@id": "urn:ex/room-114-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-damper-out",
+        "@id": "urn:ex/vav-518-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-512-duct-after-damper"
+                "@id": "urn:ex/connection-to-room-202"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -620,86 +716,47 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-512-colder-supply-air-requests"
+                "@id": "urn:ex/vav-518-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-512-cooling-pid-output"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-522-discharge-air-temp-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+                "@id": "urn:ex/vav-518-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "urn:ex/vav-522-air-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:ex/vav-518-discharge-air-temp"
+            },
             {
-                "@id": "urn:ex/vav-522-discharge-air-temp"
+                "@id": "urn:ex/vav-518-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-damper-in",
+        "@id": "urn:ex/vav-510-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-521-air-in"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-215-occupancy",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-102-out",
+        "@id": "urn:ex/vav-524-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-flow",
+        "@id": "urn:ex/vav-505-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Supply"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -713,132 +770,68 @@
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-108",
+        "@id": "urn:ex/vav-509-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-210",
+        "@id": "urn:ex/vav-528-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/room-210-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-reheat-coil",
+        "@id": "urn:ex/vav-536-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-519-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-519-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-519-reheat-coil-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-519-reheat-coil-water-out"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515",
+        "@id": "urn:ex/vav-532-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-515-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-515-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-515-hot-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-515-hot-water-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-515-damper"
-            },
-            {
-                "@id": "urn:ex/vav-515-reheat-coil"
-            },
-            {
-                "@id": "urn:ex/vav-515-reheat-coil-valve"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-115-occupancy-override",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-519-damper-command",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-532-pipe-hot-water-return-before-valve"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-110-occupancy",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-301-out",
+        "@id": "urn:ex/vav-510-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -848,42 +841,29 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil-air-out",
+        "@id": "urn:ex/vav-524-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-307-308"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-531-heating-pid-output"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-531-more-heat-requests"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-531-air-out"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-303-out",
+        "@id": "urn:ex/vav-519-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -893,71 +873,40 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-528-damper-position",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-510-heating-pid-output",
+        "@id": "urn:ex/zone-108-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil-valve-position",
+        "@id": "urn:ex/zone-103-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-co2-concentration-setpoint",
+        "@id": "urn:ex/vav-526-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://data.ashrae.org/standard223#ofSubstance": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Substance-CO2"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/MoleFraction"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PPM"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
@@ -988,90 +937,89 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-507-reheat-coil-valve-actuator",
+        "@id": "urn:ex/room-108-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-507-reheat-coil-valve"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-507-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-532-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-538-air-in"
+                "@id": "urn:ex/vav-532-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-532-reheat-coil-valve-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-538-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-532-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-532-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-512-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-more-heat-requests",
+        "@id": "urn:ex/zone-202-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-reheat-coil-air-out",
+        "@id": "urn:ex/zone-307-308-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-208-209"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-522-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-522-more-heat-requests"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-522-air-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
@@ -1092,7 +1040,7 @@
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-110",
+        "@id": "urn:ex/vav-519-duct-after-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -1104,139 +1052,83 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-damper",
-        "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-oa-damper-in"
-            },
-            {
-                "@id": "urn:ex/office-ahu-oa-damper-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/office-ahu-oa-damper-command"
-            },
-            {
-                "@id": "urn:ex/office-ahu-oa-damper-position"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Economizer"
-            },
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Outside"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-201-out",
+        "@id": "urn:ex/vav-503-reheat-coil-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-503-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-521-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-522-more-heat-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-509-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-521-hot-water-out-connection"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-521-hot-water-out"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-537-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-537-pipe-hot-water-return-before-valve"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-302-occupancy-override",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-damper-command",
+        "@id": "urn:ex/vav-506-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-504-discharge-air-temp-setpoint",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -1250,9 +1142,9 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-106-107-cooling-setpoint",
+        "@id": "urn:ex/zone-305-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -1266,40 +1158,30 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-516-duct-after-damper",
+        "@id": "urn:ex/vav-512-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-discharge-air-flow",
+        "@id": "urn:ex/vav-507-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-520-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -1315,210 +1197,246 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-518-hot-water-in",
+        "@id": "urn:ex/room-310",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-518-hot-water-in-connection"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-310-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-cooling-pid-output",
+        "@id": "urn:ex/vav-502-reheat-coil-valve-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-215-temp",
+        "@id": "urn:ex/vav-527-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-527-air-in"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-527-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-111-occupancy-sensor",
+        "@id": "urn:ex/vav-514-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/room-111-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-111-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-535-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-504-air-in"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-111",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-504-discharge-air-flow"
+                "@id": "urn:ex/room-111-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-more-heat-requests",
+        "@id": "urn:ex/zone-108",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/room-108-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/zone-108-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-108-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-108-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-108-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-108-temp"
+            },
+            {
+                "@id": "urn:ex/zone-108-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-heating-pid-output",
+        "@id": "urn:ex/vav-503-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-503-reheat-coil-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/vav-503-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-heating-pid-output",
+        "@id": "urn:ex/vav-523-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-523-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-523-reheat-coil-valve-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-523-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-523-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-112-114-temp-sensor",
+        "@id": "urn:ex/vav-540-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-112-hvac-domain"
+                "@id": "urn:ex/vav-540-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-112-114-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-discharge-air-temp",
+        "@id": "urn:ex/vav-506-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/vav-506-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-506-damper-command"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-519-more-heat-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-hot-water-in",
+        "@id": "urn:ex/zone-311-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-502-hot-water-in-connection"
+                "@id": "urn:ex/room-311-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/zone-311-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-reheat-coil-water-in",
+        "@id": "urn:ex/zone-201-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-517-hot-water-in-connection"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-517-hot-water-in"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-air-in",
+        "@id": "urn:ex/room-106-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -1528,37 +1446,49 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-109-window-switch-on-off",
+        "@id": "urn:ex/zone-115-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-115-hvac-domain",
+        "@id": "urn:ex/vav-538-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-115-in"
+                "@id": "urn:ex/vav-538-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/room-115-out"
+                "@id": "urn:ex/vav-538-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-538-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-538-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-duct-after-damper",
+        "@id": "urn:ex/office-ahu-connection-from-rooms",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -1570,23 +1500,49 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-515-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-515-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-515-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-515-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-515-reheat-coil-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-516-discharge-air-flow-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:ex/vav-516-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-516-discharge-air-flow"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-514-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -1602,109 +1558,117 @@
         ]
     },
     {
-        "@id": "urn:ex/room-204-out",
+        "@id": "urn:ex/room-211",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/room-211-hvac-domain"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-501-damper-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
+        ],
+        "http://data.ashrae.org/standard223#actuates": [
+            {
+                "@id": "urn:ex/vav-501-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-501-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-colder-supply-air-requests",
+        "@id": "urn:ex/vav-535-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-damper-out",
+        "@id": "urn:ex/zone-206-co2-concentration-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#ofSubstance": [
             {
-                "@id": "urn:ex/vav-514-duct-after-damper"
+                "@id": "http://data.ashrae.org/standard223#Substance-CO2"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/MoleFraction"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-514-colder-supply-air-requests"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-514-cooling-pid-output"
+                "@id": "http://qudt.org/vocab/unit/PPM"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-215-cooling-setpoint",
+        "@id": "urn:ex/vav-513-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-513-air-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-513-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-109",
+        "@id": "urn:ex/vav-531-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-damper-in",
+        "@id": "urn:ex/vav-523-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-523-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-516-air-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-111-cooling-setpoint",
+        "@id": "urn:ex/vav-536-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -1718,23 +1682,7 @@
         ]
     },
     {
-        "@id": "urn:ex/room-117-in",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-116-117"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-101-out",
+        "@id": "urn:ex/room-313-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -1750,23 +1698,23 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-102-temp-sensor",
+        "@id": "urn:ex/vav-502-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-102-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-102-temp"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-cooling-pid-output",
+        "@id": "urn:ex/vav-523-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -1782,56 +1730,71 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-530-discharge-air-flow",
+        "@id": "urn:ex/vav-526-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/vav-526-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-526-damper-command"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-204-205-cooling-setpoint",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-reheat-coil-valve",
+        "@id": "urn:ex/vav-513-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-507-reheat-coil-valve-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-507-reheat-coil-valve-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-215-heating-setpoint",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-507-reheat-coil-valve-command"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-507-reheat-coil-valve-position"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-air-in",
+        "@id": "urn:ex/vav-528-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -1847,30 +1810,37 @@
         ]
     },
     {
-        "@id": "urn:ex/room-109-out",
+        "@id": "urn:ex/vav-522-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-522-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-522-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-hot-water-in",
+        "@id": "urn:ex/office-ahu-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-510-hot-water-in-connection"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-536-hot-water-in-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -1879,19 +1849,34 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-540-duct-after-damper",
+        "@id": "urn:ex/vav-508-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-309-310-cooling-setpoint",
+        "@id": "urn:ex/zone-203-occupancy-override",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-116-117-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -1906,6 +1891,22 @@
             }
         ]
     },
+    {
+        "@id": "urn:ex/vav-532-reheat-coil-valve-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
+        ],
+        "http://data.ashrae.org/standard223#actuates": [
+            {
+                "@id": "urn:ex/vav-532-reheat-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-532-reheat-coil-valve-command"
+            }
+        ]
+    },
     {
         "@id": "urn:ex/vav-517-reheat-coil-valve",
         "@type": [
@@ -1935,23 +1936,86 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-525-discharge-air-flow-sensor",
+        "@id": "urn:ex/connection-to-room-118",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/vav-525-air-in"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-525-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-colder-supply-air-requests",
+        "@id": "urn:ex/zone-307-308-occupancy-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:ex/room-307-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-307-308-occupancy"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-528-damper-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
+        ],
+        "http://data.ashrae.org/standard223#actuates": [
+            {
+                "@id": "urn:ex/vav-528-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-528-damper-command"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-511-damper-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-511-duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-511-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-511-cooling-pid-output"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-110-occupancy",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-531-more-heat-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -1962,122 +2026,160 @@
         ]
     },
     {
-        "@id": "urn:ex/room-102",
+        "@id": "urn:ex/zone-206-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/room-102-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-discharge-air-flow",
+        "@id": "urn:ex/vav-516-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-523-reheat-coil-valve-position",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-duct-after-damper",
+        "@id": "urn:ex/vav-524-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-524-reheat-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-524-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-damper",
+        "@id": "urn:ex/zone-208-209",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-502-damper-in"
+                "@id": "urn:ex/room-208-hvac-domain"
             },
             {
-                "@id": "urn:ex/vav-502-damper-out"
+                "@id": "urn:ex/room-209-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-502-damper-command"
+                "@id": "urn:ex/zone-208-209-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-502-damper-position"
+                "@id": "urn:ex/zone-208-209-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-208-209-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-208-209-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-208-209-temp"
+            },
+            {
+                "@id": "urn:ex/zone-208-209-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-506-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-519-hot-water-out-connection"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-519-hot-water-out"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-water-in",
+        "@id": "urn:ex/vav-519-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-506-hot-water-in-connection"
+                "@id": "urn:ex/vav-519-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-515-reheat-coil-valve-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-506-hot-water-in"
+                "@id": "urn:ex/vav-515-reheat-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-515-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-damper-in",
+        "@id": "urn:ex/vav-519-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-519-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -2085,25 +2187,49 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-536-air-in"
+                "@id": "urn:ex/vav-519-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-519-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-305-occupancy",
+        "@id": "urn:ex/vav-526",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "urn:ex/vav-526-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-526-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-526-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-526-hot-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:ex/vav-526-damper"
+            },
+            {
+                "@id": "urn:ex/vav-526-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-526-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-506-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -2119,42 +2245,38 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-504-duct-after-damper",
+        "@id": "urn:ex/vav-520-hot-water-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-discharge-air-flow-setpoint",
+        "@id": "urn:ex/zone-311-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-hot-water-in",
+        "@id": "urn:ex/vav-533-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-505-hot-water-in-connection"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -2163,71 +2285,66 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-301-heating-setpoint",
+        "@id": "urn:ex/vav-516-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-202",
+        "@id": "urn:ex/vav-534-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-202-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil-water-in",
+        "@id": "urn:ex/vav-509-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-508-hot-water-in-connection"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-509-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-508-hot-water-in"
+                "@id": "urn:ex/vav-509-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-discharge-air-flow-setpoint",
+        "@id": "urn:ex/zone-207-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-duct-after-damper",
+        "@id": "urn:ex/vav-533-duct-after-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -2239,61 +2356,61 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-538-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-521-pipe-hot-water-return-before-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil-water-in",
+        "@id": "urn:ex/vav-532-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-521-hot-water-in-connection"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-532-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-521-hot-water-in"
+                "@id": "urn:ex/vav-532-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-110",
+        "@id": "urn:ex/vav-513-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-110-hvac-domain"
+                "@id": "urn:ex/vav-513-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-513-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-508-reheat-coil-valve-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-527-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-508-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -2303,177 +2420,125 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-108-window-switch-on-off",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-211-cooling-setpoint",
+        "@id": "urn:ex/vav-503-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-503-hot-water-in-connection"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-519-damper-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-519-damper"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-519-damper-command"
+                "@id": "urn:ex/vav-503-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-106-107-temp",
+        "@id": "urn:ex/vav-534-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-103",
+        "@id": "urn:ex/vav-508-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-508-hot-water-out-connection"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-air-out",
+        "@id": "urn:ex/vav-534-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-104"
+                "@id": "urn:ex/vav-534-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-503-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-503-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-503-discharge-air-temp"
-            },
-            {
-                "@id": "urn:ex/vav-503-discharge-air-temp-setpoint"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-hot-water-out-connection",
+        "@id": "urn:ex/vav-533-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-112-114-heating-setpoint",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-309-310-occupancy",
+        "@id": "urn:ex/vav-529-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-air-out",
+        "@id": "urn:ex/zone-215-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-202"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/room-215-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-518-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-518-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-518-discharge-air-temp"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-518-discharge-air-temp-setpoint"
+                "@id": "urn:ex/zone-215-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-discharge-air-flow",
+        "@id": "urn:ex/vav-522-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -2494,215 +2559,214 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-502-cooling-pid-output",
+        "@id": "urn:ex/zone-212-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/room-212-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/zone-212-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/",
+        "@id": "http://data.ashrae.org/standard223#Role-Outside",
         "@type": [
-            "http://www.w3.org/2002/07/owl#Ontology"
+            "http://data.ashrae.org/standard223#EnumerationKind-Role"
         ]
     },
     {
-        "@id": "urn:ex/vav-508-more-heat-requests",
+        "@id": "urn:ex/vav-533-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-538-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-506-pipe-hot-water-return-before-valve"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-hot-water-out-connection",
+        "@id": "urn:ex/vav-533-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-533-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-533-reheat-coil-valve-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-519-reheat-coil-valve-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-519-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-519-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-533-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-533-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-524",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-529-pipe-hot-water-return-before-valve"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-524-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-529-cooling-pid-output",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/vav-524-air-out"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-524-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-524-hot-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/vav-524-damper"
+            },
+            {
+                "@id": "urn:ex/vav-524-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-524-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-hot-water-in",
+        "@id": "urn:ex/office-ahu-connection-to-vavs",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-509-hot-water-in-connection"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-506-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-506-air-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-506-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-207-in",
+        "@id": "urn:ex/vav-540-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-207"
+                "@id": "urn:ex/connection-to-room-215"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-313-temp",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/vav-540-discharge-air-flow"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-531-reheat-coil-valve-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
+                "@id": "urn:ex/vav-540-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "urn:ex/vav-531-reheat-coil-valve"
-            }
-        ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+                "@id": "urn:ex/vav-540-discharge-air-temp"
+            },
             {
-                "@id": "urn:ex/vav-531-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-540-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-520",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-510-reheat-coil-valve"
+                "@id": "urn:ex/vav-520-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-520-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-520-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-520-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-510-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-520-damper"
+            },
+            {
+                "@id": "urn:ex/vav-520-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-520-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-108-temp",
+        "@id": "urn:ex/vav-520-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
                 "@id": "http://qudt.org/vocab/quantitykind/Temperature"
@@ -2715,89 +2779,61 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-fan-start-status",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-colder-supply-air-requests",
+        "@id": "urn:ex/vav-517-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-517-hot-water-out-connection"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-301-window-switch-on-off",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-110-occupancy-sensor",
+        "@id": "urn:ex/vav-536-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-110-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-110-occupancy"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-discharge-air-flow-sensor",
+        "@id": "urn:ex/zone-302-co2-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-521-air-in"
+                "@id": "urn:ex/room-302-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-521-discharge-air-flow"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-116",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
-        ],
-        "http://data.ashrae.org/standard223#encloses": [
-            {
-                "@id": "urn:ex/room-116-hvac-domain"
+                "@id": "urn:ex/zone-302-co2-concentration"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-damper-out",
+        "@id": "urn:ex/vav-513-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-527-duct-after-damper"
+                "@id": "urn:ex/vav-513-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -2807,87 +2843,93 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-527-colder-supply-air-requests"
+                "@id": "urn:ex/vav-513-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-527-cooling-pid-output"
+                "@id": "urn:ex/vav-513-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-311-occupancy",
+        "@id": "urn:ex/office-ahu-duct-after-moisture-eliminator",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-203-out",
+        "@id": "urn:ex/vav-525-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-525-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-525-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-116-117-occupancy",
+        "@id": "urn:ex/vav-533-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "urn:ex/vav-533-duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-hot-water-in",
+        "@id": "urn:ex/vav-530-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-513-hot-water-in-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-reheat-coil-valve-position",
+        "@id": "urn:ex/office-ahu-clg-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/office-ahu-duct-after-clg-coil"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-108-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -2901,7 +2943,7 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-528-cooling-pid-output",
+        "@id": "urn:ex/vav-527-cooling-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -2917,233 +2959,206 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-113-occupancy-override",
+        "@id": "urn:ex/vav-518-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:ex/vav-518-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-518-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-air-out",
+        "@id": "urn:ex/zone-204-205",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/connection-to-room-109"
+                "@id": "urn:ex/room-204-hvac-domain"
+            },
+            {
+                "@id": "urn:ex/room-205-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-508-discharge-air-flow"
+                "@id": "urn:ex/zone-204-205-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-508-discharge-air-flow-setpoint"
+                "@id": "urn:ex/zone-204-205-heating-setpoint"
             },
             {
-                "@id": "urn:ex/vav-508-discharge-air-temp"
+                "@id": "urn:ex/zone-204-205-occupancy"
             },
             {
-                "@id": "urn:ex/vav-508-discharge-air-temp-setpoint"
+                "@id": "urn:ex/zone-204-205-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-204-205-temp"
+            },
+            {
+                "@id": "urn:ex/zone-204-205-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-reheat-coil-air-in",
+        "@id": "urn:ex/vav-521-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-523-duct-after-damper"
+                "@id": "urn:ex/connection-to-room-204-205"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-506-hot-water-in-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-115-cooling-setpoint",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/vav-521-heating-pid-output"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-521-more-heat-requests"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-521-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil-water-in",
+        "@id": "urn:ex/room-108-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-516-hot-water-in-connection"
+                "@id": "urn:ex/connection-to-room-108"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-516-hot-water-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-530-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-520-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/connection-to-room-303-304-306"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-314",
-        "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/room-314-hvac-domain"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-314-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-314-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-314-occupancy"
+                "@id": "urn:ex/vav-530-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/zone-314-occupancy-override"
+                "@id": "urn:ex/vav-530-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/zone-314-temp"
+                "@id": "urn:ex/vav-530-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/zone-314-window-switch-on-off"
+                "@id": "urn:ex/vav-530-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-damper",
+        "@id": "urn:ex/vav-540-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Damper",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-539-damper-in"
+                "@id": "urn:ex/vav-540-damper-in"
             },
             {
-                "@id": "urn:ex/vav-539-damper-out"
+                "@id": "urn:ex/vav-540-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-539-damper-command"
+                "@id": "urn:ex/vav-540-damper-command"
             },
             {
-                "@id": "urn:ex/vav-539-damper-position"
+                "@id": "urn:ex/vav-540-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-529-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/connection-to-room-303-304-306"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-527-hot-water-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-527-hot-water-out-connection"
+                "@id": "urn:ex/vav-529-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-529-more-heat-requests"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-529-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-cooling-pid-output",
+        "@id": "urn:ex/vav-508-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-502-discharge-air-flow-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -3159,152 +3174,106 @@
         ]
     },
     {
-        "@id": "urn:ex/room-312-hvac-domain",
+        "@id": "urn:ex/zone-301-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-312-in"
-            },
-            {
-                "@id": "urn:ex/room-312-out"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-duct-after-damper",
+        "@id": "urn:ex/vav-510-hot-water-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-out",
+        "@id": "urn:ex/zone-208-209-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-516-damper-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-516-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/office-ahu-colder-supply-air-requests"
-            },
-            {
-                "@id": "urn:ex/office-ahu-increased-air-pressure-requests"
-            },
-            {
-                "@id": "urn:ex/office-ahu-sa-temp"
-            },
-            {
-                "@id": "urn:ex/office-ahu-sa-temp-setpoint"
-            },
-            {
-                "@id": "urn:ex/office-ahu-supply-duct-static-pressure"
-            },
-            {
-                "@id": "urn:ex/office-ahu-supply-duct-static-pressure-setpoint"
-            },
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/office-ahu-warmer-supply-air-requests"
+                "@id": "urn:ex/vav-516-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-109-temp-sensor",
+        "@id": "urn:ex/vav-525-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-109-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-109-temp"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-104",
+        "@id": "urn:ex/vav-501-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/room-104-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-501-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-104-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-104-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-104-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-104-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-104-temp"
-            },
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/zone-104-window-switch-on-off"
+                "@id": "urn:ex/vav-501-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-hot-water-in",
+        "@id": "urn:ex/zone-115-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-519-hot-water-in-connection"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-htg-coil-air-in",
+        "@id": "urn:ex/vav-527-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-duct-after-air-filter"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -3314,7 +3283,7 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-clg-coil-valve-command",
+        "@id": "urn:ex/vav-529-reheat-coil-valve-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -3330,65 +3299,97 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ea-out",
+        "@id": "urn:ex/zone-309-310-occupancy",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-533-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-ea-out-connection"
+                "@id": "urn:ex/connection-to-room-305"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-533-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-533-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-533-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-533-discharge-air-temp-setpoint"
+            }
         ]
     },
     {
-        "@id": "urn:ex/room-308-out",
+        "@id": "urn:ex/room-116-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/room-116-in"
+            },
+            {
+                "@id": "urn:ex/room-116-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-532-pipe-hot-water-return-before-valve",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-damper-out",
+        "@id": "urn:ex/vav-532-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-506-duct-after-damper"
+                "@id": "urn:ex/vav-532-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-506-colder-supply-air-requests"
-            },
-            {
-                "@id": "urn:ex/vav-506-cooling-pid-output"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-damper-position",
+        "@id": "urn:ex/vav-522-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -3402,48 +3403,59 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil-water-out",
+        "@id": "urn:ex/vav-503-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-508-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/connection-to-room-104"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-503-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-503-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-503-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-damper",
+        "@id": "urn:ex/vav-540-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-523-damper-in"
-            },
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-523-damper-out"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-523-damper-command"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-523-damper-position"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-damper-command",
+        "@id": "urn:ex/office-ahu-ra-fan-speed-status",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -3457,129 +3469,104 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-525",
+        "@id": "urn:ex/zone-203-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-525-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-525-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-525-hot-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-525-hot-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-525-damper"
-            },
-            {
-                "@id": "urn:ex/vav-525-reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-525-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-530-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-521-air-out"
+                "@id": "urn:ex/vav-530-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-521-discharge-air-temp"
+                "@id": "urn:ex/vav-530-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-damper",
+        "@id": "urn:ex/vav-533-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-520-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-520-damper-out"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-520-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-520-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-air-out",
+        "@id": "urn:ex/vav-518-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-106-107"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-305",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-506-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-506-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-506-air-out"
+                "@id": "urn:ex/room-305-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-hot-water-out",
+        "@id": "urn:ex/vav-503-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-540-hot-water-out-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-damper-out",
+        "@id": "urn:ex/vav-518-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-duct-after-oa-ra-damper"
+                "@id": "urn:ex/vav-518-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -3589,45 +3576,35 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-moisture-eliminator-out",
+        "@id": "urn:ex/vav-540-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-duct-after-moisture-eliminator"
+                "@id": "urn:ex/vav-540-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-540-reheat-coil-valve-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-105",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/room-105-hvac-domain"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-105-occupancy",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+                "@id": "urn:ex/vav-540-reheat-coil-valve-command"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "urn:ex/vav-540-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-512-hot-water-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -3639,105 +3616,98 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-108-cooling-setpoint",
+        "@id": "urn:ex/zone-215-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-505-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-hot-water-in-connection",
+        "@id": "urn:ex/vav-507-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-527-reheat-coil-air-in",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-527-duct-after-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-more-heat-requests",
+        "@id": "urn:ex/zone-214",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/room-214-hvac-domain"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-htg-coil-water-in",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/office-ahu-hot-water-in-connection"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+                "@id": "urn:ex/zone-214-cooling-setpoint"
+            },
             {
-                "@id": "urn:ex/office-ahu-hot-water-in"
+                "@id": "urn:ex/zone-214-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-214-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-214-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-214-temp"
+            },
+            {
+                "@id": "urn:ex/zone-214-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-reheat-coil-water-out",
+        "@id": "urn:ex/vav-512-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-504-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-512-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -3747,148 +3717,160 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-534-hot-water-out",
+        "@id": "urn:ex/vav-528-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-534-hot-water-out-connection"
+                "@id": "urn:ex/connection-to-room-302"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-207-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-528-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-528-more-heat-requests"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-528-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-discharge-air-flow",
+        "@id": "urn:ex/zone-115-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-hot-water-out",
+        "@id": "urn:ex/vav-534-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-517-hot-water-out-connection"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-534-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-533-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-539-reheat-coil-valve"
+                "@id": "urn:ex/vav-533-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-539-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-533-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-damper-out",
+        "@id": "urn:ex/vav-535-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-504-duct-after-damper"
+                "@id": "urn:ex/vav-535-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-535-reheat-coil-valve-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-504-colder-supply-air-requests"
+                "@id": "urn:ex/vav-535-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-504-cooling-pid-output"
+                "@id": "urn:ex/vav-535-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-311-heating-setpoint",
+        "@id": "urn:ex/office-ahu-colder-chilled-water-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-505-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil-valve-position",
+        "@id": "urn:ex/zone-108-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-duct-after-damper",
+        "@id": "urn:ex/office-ahu-oa-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -3900,92 +3882,139 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-520-air-out",
+        "@id": "urn:ex/vav-525-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-207"
+                "@id": "urn:ex/vav-525-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-532-reheat-coil-valve-command",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-520-discharge-air-flow"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-520-discharge-air-flow-setpoint"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-509-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-509-damper-in"
             },
             {
-                "@id": "urn:ex/vav-520-discharge-air-temp"
+                "@id": "urn:ex/vav-509-damper-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-509-damper-command"
             },
             {
-                "@id": "urn:ex/vav-520-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-509-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-hot-water-in-connection",
+        "@id": "urn:ex/office-ahu-ma-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:ex/office-ahu-air-filter-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/office-ahu-ma-temp"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-522-reheat-coil-valve-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-522-hot-water-out-connection"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-522-hot-water-out"
+            }
         ]
     },
     {
-        "@id": "urn:ex/zone-106-107-occupancy-override",
+        "@id": "urn:ex/zone-301-window-switch-on-off",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-damper-actuator",
+        "@id": "urn:ex/vav-511-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-516-damper"
+                "@id": "urn:ex/connection-to-room-112-114"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-516-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-104-heating-setpoint",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-511-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-511-more-heat-requests"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-511-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-discharge-air-temp",
+        "@id": "urn:ex/vav-510-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -3996,193 +4025,179 @@
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-cooling-pid-output",
+        "@id": "urn:ex/vav-509-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-509-hot-water-out-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-103-occupancy",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "urn:ex/vav-509-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-514-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-533-pipe-hot-water-return-before-valve"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-514-duct-after-damper"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-510-pipe-hot-water-return-before-valve",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-201-occupancy-override",
+        "@id": "urn:ex/zone-118-window-switch-on-off",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-air-in",
+        "@id": "urn:ex/vav-507-hot-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-507-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-supply-duct-static-pressure-setpoint",
+        "@id": "urn:ex/vav-515-discharge-air-flow-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-212-window-switch-on-off",
+        "@id": "urn:ex/vav-529-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-512-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-519-air-out"
+                "@id": "urn:ex/vav-512-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-519-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-heating-pid-output",
+        "@id": "urn:ex/vav-523-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-523-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/vav-523-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil-air-out",
+        "@id": "urn:ex/zone-307-308-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/connection-to-room-210"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-531-reheat-coil-water-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-531-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-524-heating-pid-output"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-524-more-heat-requests"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-524-air-out"
+                "@id": "urn:ex/vav-531-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-air-out",
+        "@id": "urn:ex/vav-535-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-302"
+                "@id": "urn:ex/vav-535-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -4192,27 +4207,18 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-528-heating-pid-output"
+                "@id": "urn:ex/vav-535-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-528-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-528-air-out"
+                "@id": "urn:ex/vav-535-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil-water-out",
+        "@id": "urn:ex/vav-522-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-533-pipe-hot-water-return-before-valve"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -4221,39 +4227,28 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-538-hot-water-out",
+        "@id": "urn:ex/vav-527-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-538-hot-water-out-connection"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-530-reheat-coil-valve-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-530-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-530-reheat-coil-valve-command"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-damper-position",
+        "@id": "urn:ex/vav-518-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -4269,51 +4264,62 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-temp-setpoint",
+        "@id": "urn:ex/vav-505-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-reheat-coil-valve-in",
+        "@id": "urn:ex/room-211-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-519-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/room-211-in"
+            },
+            {
+                "@id": "urn:ex/room-211-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-108-in",
+        "@id": "urn:ex/vav-529-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-108"
+                "@id": "urn:ex/vav-529-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-529-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-529-cooling-pid-output"
+            }
         ]
     },
     {
@@ -4333,337 +4339,348 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-507-hot-water-in",
+        "@id": "urn:ex/zone-110-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-507-hot-water-in-connection"
+                "@id": "urn:ex/room-110-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/zone-110-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-511-reheat-coil-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-540-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-511-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-511-hot-water-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-damper-actuator",
+        "@id": "urn:ex/vav-515-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-535-damper"
+                "@id": "urn:ex/connection-to-room-116-117"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-535-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-515-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-515-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-515-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-valve",
+        "@id": "urn:ex/vav-531-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-529-reheat-coil-valve-in"
+                "@id": "urn:ex/vav-531-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-529-reheat-coil-valve-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-531-reheat-coil-air-out"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "urn:ex/vav-531-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-531-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-529-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-529-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-cooling-pid-output",
+        "@id": "urn:ex/vav-526-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-supply-duct-static-pressure",
+        "@id": "urn:ex/vav-540-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Supply"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "urn:ex/vav-540-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-110-temp-sensor",
+        "@id": "urn:ex/vav-511-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-110-hvac-domain"
+                "@id": "urn:ex/vav-511-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-110-temp"
+                "@id": "urn:ex/vav-511-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-damper-out",
+        "@id": "urn:ex/vav-514-pipe-hot-water-return-before-valve",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-525-reheat-coil-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-532-duct-after-damper"
+                "@id": "urn:ex/vav-525-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-535-reheat-coil-water-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-532-colder-supply-air-requests"
-            },
+                "@id": "urn:ex/vav-535-pipe-hot-water-return-before-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-532-cooling-pid-output"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-302-co2-concentration-setpoint",
+        "@id": "urn:ex/connection-to-room-112-114",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#ofSubstance": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Substance-CO2"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-507-discharge-air-temp-setpoint",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/MoleFraction"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PPM"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-311",
+        "@id": "urn:ex/vav-513-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-311-hvac-domain"
+                "@id": "urn:ex/vav-513-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-311-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-311-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-311-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-311-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-311-temp"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/zone-311-window-switch-on-off"
+                "@id": "urn:ex/vav-513-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-colder-supply-air-requests",
+        "@id": "urn:ex/room-307",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/room-307-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-214",
+        "@id": "urn:ex/vav-522-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-214-hvac-domain"
+                "@id": "urn:ex/vav-522-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-214-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-214-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-214-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-214-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-214-temp"
+                "@id": "urn:ex/vav-522-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/zone-214-window-switch-on-off"
+                "@id": "urn:ex/vav-522-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-reheat-coil-valve-out",
+        "@id": "urn:ex/office-ahu-sa-fan-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-535-hot-water-out-connection"
+                "@id": "urn:ex/office-ahu-duct-after-clg-coil"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-535-hot-water-out"
+                "@id": "urn:ex/office-ahu-sa-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-102-heating-setpoint",
+        "@id": "urn:ex/vav-518-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-518-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-518-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil-water-in",
+        "@id": "urn:ex/vav-518-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-531-hot-water-in-connection"
+                "@id": "urn:ex/vav-518-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-531-hot-water-in"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-116-117-window-switch-on-off",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+                "@id": "urn:ex/vav-518-colder-supply-air-requests"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "urn:ex/vav-518-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ea-damper-command",
+        "@id": "urn:ex/vav-519-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -4677,94 +4694,79 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-537",
+        "@id": "urn:ex/vav-515-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-537-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-537-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-537-hot-water-in"
-            },
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-537-hot-water-out"
+                "@id": "urn:ex/vav-515-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-537-damper"
-            },
-            {
-                "@id": "urn:ex/vav-537-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-537-reheat-coil-valve"
+                "@id": "urn:ex/vav-515-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-air-in",
+        "@id": "urn:ex/vav-521-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-more-heat-requests",
+        "@id": "urn:ex/zone-207-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-discharge-air-temp",
+        "@id": "urn:ex/zone-302-co2-concentration",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#ofSubstance": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "http://data.ashrae.org/standard223#Substance-CO2"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/MoleFraction"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PPM"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-air-in",
+        "@id": "urn:ex/vav-504-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -4773,61 +4775,41 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-525-colder-supply-air-requests",
+        "@id": "urn:ex/vav-540-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-540-air-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-540-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-discharge-air-temp",
+        "@id": "urn:ex/vav-503-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-moisture-eliminator",
-        "@type": [
-            "http://data.ashrae.org/standard223#AirFilter",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Filter"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-moisture-eliminator-in"
-            },
-            {
-                "@id": "urn:ex/office-ahu-moisture-eliminator-out"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-discharge-air-temp",
+        "@id": "urn:ex/vav-539-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -4841,52 +4823,48 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-536-more-heat-requests",
+        "@id": "urn:ex/vav-529-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-539-reheat-coil-valve-command",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/vav-529-damper-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-529-damper-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-529-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-529-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-208-209-cooling-setpoint",
+        "@id": "urn:ex/vav-535-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-204-205-heating-setpoint",
+        "@id": "urn:ex/zone-212-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -4900,13 +4878,13 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-504-reheat-coil-water-in",
+        "@id": "urn:ex/vav-516-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-504-hot-water-in-connection"
+                "@id": "urn:ex/vav-516-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -4916,12 +4894,12 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-504-hot-water-in"
+                "@id": "urn:ex/vav-516-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-air-in",
+        "@id": "urn:ex/vav-510-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -4934,186 +4912,119 @@
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-101-occupancy-override",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:ex/vav-510-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-hot-water-out-connection",
+        "@id": "urn:ex/vav-525-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-clg-coil-valve-in",
+        "@id": "urn:ex/vav-525-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-pipe-chilled-water-return-before-valve"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-525-reheat-coil-valve-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-525-reheat-coil-valve-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-514-discharge-air-temp",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/vav-525-reheat-coil-valve-command"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-525-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-reheat-coil",
+        "@id": "urn:ex/office-ahu-clg-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-537-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-537-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-537-reheat-coil-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-537-reheat-coil-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-hot-water-out",
+        "@id": "urn:ex/vav-524-reheat-coil-valve-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-512-hot-water-out-connection"
+                "@id": "urn:ex/vav-524-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-504-damper-position",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-524-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-520-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-520-hot-water-in-connection"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-503-pipe-hot-water-return-before-valve",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-ra-flow-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/office-ahu-ra-in"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:ex/office-ahu-ra-flow"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-203-occupancy",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "urn:ex/vav-520-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-207",
+        "@id": "urn:ex/zone-109",
         "@type": [
             "http://data.ashrae.org/standard223#Zone",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/room-207-hvac-domain"
+                "@id": "urn:ex/room-109-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#hasDomain": [
@@ -5123,97 +5034,85 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-207-cooling-setpoint"
+                "@id": "urn:ex/zone-109-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/zone-207-heating-setpoint"
+                "@id": "urn:ex/zone-109-heating-setpoint"
             },
             {
-                "@id": "urn:ex/zone-207-occupancy"
+                "@id": "urn:ex/zone-109-occupancy"
             },
             {
-                "@id": "urn:ex/zone-207-occupancy-override"
+                "@id": "urn:ex/zone-109-occupancy-override"
             },
             {
-                "@id": "urn:ex/zone-207-temp"
+                "@id": "urn:ex/zone-109-temp"
             },
             {
-                "@id": "urn:ex/zone-207-window-switch-on-off"
+                "@id": "urn:ex/zone-109-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-colder-supply-air-requests",
+        "@id": "urn:ex/zone-314",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/room-314-hvac-domain"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-516-discharge-air-flow-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-516-air-in"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-516-discharge-air-flow"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-523-reheat-coil-valve-position",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/zone-314-cooling-setpoint"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/zone-314-heating-setpoint"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/zone-314-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-314-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-314-temp"
+            },
+            {
+                "@id": "urn:ex/zone-314-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-more-heat-requests",
+        "@id": "urn:ex/vav-537-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-537-hot-water-in-connection"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-511-discharge-air-temp-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-511-air-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-511-discharge-air-temp"
+                "@id": "urn:ex/vav-537-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-heating-pid-output",
+        "@id": "urn:ex/vav-510-cooling-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -5229,7 +5128,7 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-501-hot-water-in-connection",
+        "@id": "urn:ex/vav-525-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -5241,243 +5140,287 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-522-reheat-coil-air-in",
+        "@id": "urn:ex/vav-517-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-522-duct-after-damper"
+                "@id": "urn:ex/connection-to-room-203"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-525-reheat-coil-air-in",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-525-duct-after-damper"
+                "@id": "urn:ex/vav-517-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-517-more-heat-requests"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-517-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-damper-in",
+        "@id": "urn:ex/vav-534-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-538-air-in"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-303-304-306-window-switch-on-off",
+        "@id": "urn:ex/vav-530-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-118-heating-setpoint",
+        "@id": "urn:ex/vav-501-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-501-hot-water-out-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-313-cooling-setpoint",
+        "@id": "urn:ex/vav-532-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-532-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-532-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-duct-after-oa-ra-damper",
+        "@id": "urn:ex/zone-118",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/room-118-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/zone-118-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-118-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-118-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-118-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-118-temp"
+            },
+            {
+                "@id": "urn:ex/zone-118-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-hot-water-out-connection",
+        "@id": "urn:ex/office-ahu-air-filter-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/office-ahu-duct-after-air-filter"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil-water-out",
+        "@id": "urn:ex/room-104-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-524-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-reheat-coil-valve-command",
+        "@id": "urn:ex/zone-309-310-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-damper",
+        "@id": "urn:ex/vav-525-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-506-damper-in"
-            },
+                "@id": "urn:ex/vav-525-hot-water-in-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-506-damper-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-506-damper-command"
-            },
+                "@id": "urn:ex/vav-525-hot-water-in"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-515-pipe-hot-water-return-before-valve",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-506-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-damper",
+        "@id": "urn:ex/vav-505-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-510-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-510-damper-out"
+                "@id": "urn:ex/vav-505-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-510-damper-command"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-510-damper-position"
+                "@id": "urn:ex/vav-505-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-damper-position",
+        "@id": "urn:ex/vav-522-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-cooling-pid-output",
+        "@id": "urn:ex/vav-532-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/connection-to-room-309-310"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-532-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-532-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-532-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-532-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-311-out",
+        "@id": "urn:ex/room-303-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/connection-to-room-303-304-306"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -5487,32 +5430,35 @@
         ]
     },
     {
-        "@id": "urn:ex/room-117-hvac-domain",
+        "@id": "urn:ex/vav-514-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-117-in"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/room-117-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-521-colder-supply-air-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-reheat-coil-air-out",
+        "@id": "urn:ex/vav-509-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-211"
+                "@id": "urn:ex/connection-to-room-113"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -5522,69 +5468,54 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-525-heating-pid-output"
+                "@id": "urn:ex/vav-509-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-525-more-heat-requests"
+                "@id": "urn:ex/vav-509-more-heat-requests"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-525-air-out"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-504-more-heat-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-509-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ea-damper-position",
+        "@id": "urn:ex/vav-503-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-503-hot-water-out-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-110-heating-setpoint",
+        "@id": "urn:ex/connection-to-room-202",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-in",
+        "@id": "urn:ex/vav-530-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -5592,17 +5523,14 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/office-ahu-ra-flow"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/office-ahu-ra-temp"
+                "@id": "urn:ex/vav-530-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-damper-command",
+        "@id": "urn:ex/vav-519-reheat-coil-valve-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -5618,157 +5546,180 @@
         ]
     },
     {
-        "@id": "urn:ex/room-113-in",
+        "@id": "urn:ex/vav-524-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-113"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-colder-supply-air-requests",
+        "@id": "urn:ex/vav-504-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-504-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-504-damper-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-504-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-504-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-reheat-coil-water-out",
+        "@id": "urn:ex/vav-520-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-518-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/connection-to-room-207"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-105-occupancy-override",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:ex/vav-520-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-520-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-520-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-520-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-air-in",
+        "@id": "urn:ex/vav-535-hot-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-535-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil-water-out",
+        "@id": "urn:ex/vav-539-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-514-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-539-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-539-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-air-out",
+        "@id": "urn:ex/vav-527-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-312"
+                "@id": "urn:ex/vav-527-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-507-colder-supply-air-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-537-discharge-air-flow"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-537-discharge-air-flow-setpoint"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-206-cooling-setpoint",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-537-discharge-air-temp"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-537-discharge-air-temp-setpoint"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522",
+        "@id": "urn:ex/vav-521",
         "@type": [
             "http://data.ashrae.org/standard223#SingleDuctTerminal",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-522-air-in"
+                "@id": "urn:ex/vav-521-air-in"
             },
             {
-                "@id": "urn:ex/vav-522-air-out"
+                "@id": "urn:ex/vav-521-air-out"
             },
             {
-                "@id": "urn:ex/vav-522-hot-water-in"
+                "@id": "urn:ex/vav-521-hot-water-in"
             },
             {
-                "@id": "urn:ex/vav-522-hot-water-out"
+                "@id": "urn:ex/vav-521-hot-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-522-damper"
+                "@id": "urn:ex/vav-521-damper"
             },
             {
-                "@id": "urn:ex/vav-522-reheat-coil"
+                "@id": "urn:ex/vav-521-reheat-coil"
             },
             {
-                "@id": "urn:ex/vav-522-reheat-coil-valve"
+                "@id": "urn:ex/vav-521-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-damper-command",
+        "@id": "urn:ex/vav-535-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -5782,311 +5733,289 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-201-temp",
+        "@id": "urn:ex/vav-501-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-colder-supply-air-requests",
+        "@id": "urn:ex/vav-520-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-520-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-520-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-204-205",
+        "@id": "urn:ex/vav-523-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/room-204-hvac-domain"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-205-hvac-domain"
+                "@id": "urn:ex/vav-523-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-523-discharge-air-temp"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-540-reheat-coil",
+        "@type": [
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-204-205-cooling-setpoint"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/zone-204-205-heating-setpoint"
+                "@id": "urn:ex/vav-540-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/zone-204-205-occupancy"
+                "@id": "urn:ex/vav-540-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/zone-204-205-occupancy-override"
+                "@id": "urn:ex/vav-540-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/zone-204-205-temp"
-            },
+                "@id": "urn:ex/vav-540-reheat-coil-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/zone-204-205-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-damper",
+        "@id": "urn:ex/office-ahu-sa-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-515-damper-in"
-            },
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-515-damper-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-515-damper-command"
+                "@id": "urn:ex/office-ahu-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-515-damper-position"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-539-reheat-coil",
-        "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-539-reheat-coil-air-in"
+                "@id": "urn:ex/office-ahu-increased-air-pressure-requests"
             },
             {
-                "@id": "urn:ex/vav-539-reheat-coil-air-out"
+                "@id": "urn:ex/office-ahu-sa-temp"
             },
             {
-                "@id": "urn:ex/vav-539-reheat-coil-water-in"
+                "@id": "urn:ex/office-ahu-sa-temp-setpoint"
             },
             {
-                "@id": "urn:ex/vav-539-reheat-coil-water-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
+                "@id": "urn:ex/office-ahu-supply-duct-static-pressure"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-210-occupancy",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+                "@id": "urn:ex/office-ahu-supply-duct-static-pressure-setpoint"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "urn:ex/office-ahu-warmer-supply-air-requests"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-damper-in",
+        "@id": "urn:ex/vav-509-reheat-coil-valve-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-509-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-513-air-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-damper-command",
+        "@id": "urn:ex/zone-106-107",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/room-106-hvac-domain"
+            },
+            {
+                "@id": "urn:ex/room-107-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/zone-106-107-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-106-107-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-106-107-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-106-107-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-106-107-temp"
+            },
+            {
+                "@id": "urn:ex/zone-106-107-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil-valve-command",
+        "@id": "urn:ex/zone-112-114-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil-water-in",
+        "@id": "urn:ex/vav-507-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-534-hot-water-in-connection"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-534-hot-water-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-discharge-air-flow-sensor",
+        "@id": "urn:ex/room-107-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-540-air-in"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-540-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-discharge-air-flow-setpoint",
+        "@id": "urn:ex/office-ahu-htg-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/office-ahu-duct-after-air-filter"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-damper-in",
+        "@id": "urn:ex/connection-to-room-115",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-539-air-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-reheat-coil-valve",
+        "@id": "urn:ex/vav-507-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-523-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-523-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-507-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-523-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-507-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-523-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-507-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-513-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-513-hot-water-in-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-hot-water-out",
+        "@id": "urn:ex/vav-534-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-504-hot-water-out-connection"
+                "@id": "urn:ex/vav-534-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -6096,112 +6025,96 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-537-hot-water-out",
+        "@id": "urn:ex/vav-537-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-537-hot-water-out-connection"
+                "@id": "urn:ex/connection-to-room-312"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-528-damper",
-        "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-528-damper-in"
+                "@id": "urn:ex/vav-537-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-528-damper-out"
+                "@id": "urn:ex/vav-537-more-heat-requests"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-528-damper-command"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-528-damper-position"
+                "@id": "urn:ex/vav-537-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil-valve",
+        "@id": "urn:ex/vav-536-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-527-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-527-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-536-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-527-reheat-coil-valve-command"
-            },
-            {
-                "@id": "urn:ex/vav-527-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-damper-position",
+        "@id": "urn:ex/zone-101-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-213-window-switch-on-off",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-discharge-air-flow-setpoint",
+        "@id": "urn:ex/office-ahu-ea-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil-water-in",
+        "@id": "urn:ex/vav-516-reheat-coil-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-514-hot-water-in-connection"
+                "@id": "urn:ex/vav-516-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -6211,33 +6124,44 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-514-hot-water-in"
+                "@id": "urn:ex/vav-516-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-discharge-air-flow",
+        "@id": "urn:ex/vav-508-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/vav-508-reheat-coil-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-508-reheat-coil-valve-command"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-302-occupancy-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/room-302-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-302-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-air-in",
+        "@id": "urn:ex/vav-501-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -6253,169 +6177,152 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-519-reheat-coil-valve-position",
+        "@id": "urn:ex/room-103-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/connection-to-room-103"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-301-occupancy-override",
+        "@id": "urn:ex/vav-510-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:ex/connection-to-room-111"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-309-310-temp-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-309-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-309-310-temp"
+                "@id": "urn:ex/vav-510-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-510-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-510-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-510-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-535-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530",
+        "@id": "urn:ex/vav-502-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-530-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-530-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-530-hot-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-530-hot-water-out"
+                "@id": "urn:ex/vav-502-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-530-damper"
-            },
-            {
-                "@id": "urn:ex/vav-530-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-530-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-damper-actuator",
+        "@id": "urn:ex/zone-106-107-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-504-damper"
+                "@id": "urn:ex/room-106-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-504-damper-command"
+                "@id": "urn:ex/zone-106-107-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-reheat-coil-valve-actuator",
+        "@id": "urn:ex/room-203-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-509-reheat-coil-valve"
+                "@id": "urn:ex/connection-to-room-203"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-509-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-214-heating-setpoint",
+        "@id": "urn:ex/room-204-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/connection-to-room-204-205"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-hot-water-in",
+        "@id": "urn:ex/vav-528-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-527-hot-water-in-connection"
+                "@id": "urn:ex/vav-528-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-314-in",
+        "@id": "urn:ex/office-ahu-duct-after-clg-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-314"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -6424,23 +6331,19 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-507-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-521-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/vav-507-air-in"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-507-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-discharge-air-flow",
+        "@id": "urn:ex/vav-534-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -6461,91 +6364,133 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-517-reheat-coil-air-out",
+        "@id": "urn:ex/vav-513-colder-supply-air-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-310-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-203"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-202-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-517-heating-pid-output"
-            },
+                "@id": "urn:ex/connection-to-room-202"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-517-more-heat-requests"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-533-hot-water-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-533-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-517-air-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-102-occupancy-override",
+        "@id": "urn:ex/zone-108-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:ex/room-108-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-108-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-discharge-air-flow-setpoint",
+        "@id": "urn:ex/zone-104-cooling-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-reheat-coil-water-in",
+        "@id": "urn:ex/vav-517-reheat-coil-valve-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-501-hot-water-in-connection"
+                "@id": "urn:ex/vav-517-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-501-hot-water-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-reheat-coil-water-out",
+        "@id": "urn:ex/zone-102-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-530-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/room-102-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-102-temp"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-520-pipe-hot-water-return-before-valve",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -6554,258 +6499,218 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-522-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-reheat-coil",
+        "@id": "urn:ex/vav-524-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-502-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-502-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-502-reheat-coil-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-502-reheat-coil-water-out"
+                "@id": "urn:ex/vav-524-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-damper-actuator",
+        "@id": "urn:ex/vav-527-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-527-damper"
+                "@id": "urn:ex/vav-527-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-527-damper-command"
+                "@id": "urn:ex/vav-527-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527",
+        "@id": "urn:ex/vav-518-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-527-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-527-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-527-hot-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-527-hot-water-out"
+                "@id": "urn:ex/vav-518-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-527-damper"
-            },
-            {
-                "@id": "urn:ex/vav-527-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-527-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-damper-position",
+        "@id": "urn:ex/vav-504-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-530-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-530-hot-water-in-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-530-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-109",
+        "@id": "urn:ex/vav-513-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/room-109-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-513-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-109-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-109-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-109-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-109-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-109-temp"
-            },
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/zone-109-window-switch-on-off"
+                "@id": "urn:ex/vav-513-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-104",
+        "@id": "urn:ex/vav-503-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-104-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-discharge-air-flow",
+        "@id": "urn:ex/vav-534-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-534-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-214-occupancy-sensor",
+        "@id": "urn:ex/vav-517-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-214-hvac-domain"
+                "@id": "urn:ex/vav-517-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-214-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil-valve",
+        "@id": "urn:ex/vav-501-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-514-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-514-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-501-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-516-hot-water-in-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-514-reheat-coil-valve-command"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-116",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-514-reheat-coil-valve-position"
+                "@id": "urn:ex/room-116-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-reheat-coil",
+        "@id": "urn:ex/vav-512-reheat-coil",
         "@type": [
             "http://data.ashrae.org/standard223#HeatingCoil",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-518-reheat-coil-air-in"
+                "@id": "urn:ex/vav-512-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-518-reheat-coil-air-out"
+                "@id": "urn:ex/vav-512-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-518-reheat-coil-water-in"
+                "@id": "urn:ex/vav-512-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-518-reheat-coil-water-out"
+                "@id": "urn:ex/vav-512-reheat-coil-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasRole": [
@@ -6815,56 +6720,23 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-fan-power",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/W"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-538-hot-water-out-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-518-damper-in",
+        "@id": "urn:ex/room-306-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/connection-to-room-303-304-306"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-518-air-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-discharge-air-flow",
+        "@id": "urn:ex/vav-528-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -6885,26 +6757,23 @@
         ]
     },
     {
-        "@id": "urn:ex/room-214-hvac-domain",
+        "@id": "urn:ex/vav-523-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-214-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-214-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-colder-supply-air-requests",
+        "@id": "urn:ex/vav-536-colder-supply-air-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -6915,42 +6784,70 @@
         ]
     },
     {
-        "@id": "urn:ex/room-311-hvac-domain",
+        "@id": "urn:ex/vav-514-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-535-reheat-coil",
+        "@type": [
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-311-in"
+                "@id": "urn:ex/vav-535-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/room-311-out"
+                "@id": "urn:ex/vav-535-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-535-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-535-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-damper-actuator",
+        "@id": "urn:ex/vav-505-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-513-damper"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-513-damper-command"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-hot-water-in-connection",
+        "@id": "urn:ex/vav-515-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -6962,95 +6859,105 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-116-117-temp-sensor",
+        "@id": "urn:ex/vav-523-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-116-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-116-117-temp"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-damper-command",
+        "@id": "urn:ex/vav-534-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-534-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-534-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-534-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-534-reheat-coil-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-connection-from-rooms",
+        "@id": "urn:ex/office-ahu-ra-fan-power",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/W"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-107-out",
+        "@id": "urn:ex/vav-503-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-503-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-523-pipe-hot-water-return-before-valve",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-503-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-503-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-hot-water-in",
+        "@id": "urn:ex/zone-210-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-523-hot-water-in-connection"
+                "@id": "urn:ex/room-210-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/zone-210-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-108-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -7066,82 +6973,98 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-501-discharge-air-flow",
+        "@id": "urn:ex/vav-514-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/vav-514-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-heating-pid-output",
+        "@id": "urn:ex/office-ahu-ea-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/office-ahu-ea-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/office-ahu-ea-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-hot-water-out",
+        "@id": "urn:ex/vav-510-reheat-coil-valve-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-531-hot-water-out-connection"
+                "@id": "urn:ex/vav-510-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-510-hot-water-out"
+            }
         ]
     },
     {
-        "@id": "urn:ex/zone-311-temp",
+        "@id": "urn:ex/vav-530-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-hot-water-in",
+        "@id": "urn:ex/vav-530-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-513-hot-water-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-521-hot-water-in-connection"
+                "@id": "urn:ex/vav-513-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -7151,10 +7074,14 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-522-hot-water-in-connection",
+        "@id": "urn:ex/vav-538-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-538-hot-water-out-connection"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -7163,135 +7090,160 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-208-209-heating-setpoint",
+        "@id": "urn:ex/room-309",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/room-309-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-118",
+        "@id": "urn:ex/connection-to-room-201",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-118-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-511-air-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/connection-to-room-112-114"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-118-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-118-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-118-occupancy"
+                "@id": "urn:ex/vav-511-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/zone-118-occupancy-override"
+                "@id": "urn:ex/vav-511-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/zone-118-temp"
+                "@id": "urn:ex/vav-511-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/zone-118-window-switch-on-off"
+                "@id": "urn:ex/vav-511-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-536-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-523-hot-water-out-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-111-temp-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-523-hot-water-out"
+                "@id": "urn:ex/room-111-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-111-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-htg-coil-valve-position",
+        "@id": "urn:ex/zone-302-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-water-out",
+        "@id": "urn:ex/room-202-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-506-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/room-202-in"
+            },
+            {
+                "@id": "urn:ex/room-202-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-damper-actuator",
+        "@id": "urn:ex/zone-207-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-532-damper"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-515-cooling-pid-output",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-532-damper-command"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-damper-out",
+        "@id": "urn:ex/vav-513-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-525-duct-after-damper"
+                "@id": "urn:ex/connection-to-room-103"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -7301,192 +7253,223 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-525-colder-supply-air-requests"
+                "@id": "urn:ex/vav-513-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-525-cooling-pid-output"
+                "@id": "urn:ex/vav-513-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-513-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-212-in",
+        "@id": "urn:ex/vav-533-hot-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-212"
+                "@id": "urn:ex/vav-533-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-heating-pid-output",
+        "@id": "urn:ex/vav-511-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-511-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-511-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-511-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-511-reheat-coil-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-discharge-air-flow",
+        "@id": "urn:ex/zone-303-304-306-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/room-303-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/zone-303-304-306-temp"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-312",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/room-312-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-501",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-501-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-501-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-501-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-501-hot-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/vav-501-damper"
+            },
+            {
+                "@id": "urn:ex/vav-501-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-501-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-damper-position",
+        "@id": "urn:ex/office-ahu-oa-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/office-ahu-oa-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/office-ahu-oa-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-reheat-coil-valve",
+        "@id": "urn:ex/vav-512-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-505-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-505-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-512-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-109",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-505-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-505-reheat-coil-valve-position"
+                "@id": "urn:ex/room-109-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-113-heating-setpoint",
+        "@id": "urn:ex/vav-517-discharge-air-flow-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-113",
+        "@id": "urn:ex/zone-301-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/room-113-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-519-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-519-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-536-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-514-hot-water-out-connection"
-            }
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-536-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-514-hot-water-out"
+                "@id": "urn:ex/vav-536-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-101-cooling-setpoint",
+        "@id": "urn:ex/vav-505-discharge-air-temp-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -7502,88 +7485,121 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-flow",
+        "@id": "urn:ex/zone-203-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Return"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-510-reheat-coil-valve-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-510-reheat-coil-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/vav-510-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-air-in",
+        "@id": "urn:ex/zone-201",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/room-201-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/zone-201-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-201-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-201-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-201-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-201-temp"
+            },
+            {
+                "@id": "urn:ex/zone-201-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-air-in",
+        "@id": "urn:ex/vav-532-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-pipe-chilled-water-return-before-valve",
+        "@id": "urn:ex/office-ahu-clg-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#ChilledWaterValve"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/office-ahu-clg-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-clg-coil-valve-out"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/office-ahu-clg-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/office-ahu-clg-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-cooling-pid-output",
+        "@id": "urn:ex/vav-516-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-damper-position",
+        "@id": "urn:ex/vav-509-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -7599,124 +7615,127 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil-air-in",
+        "@id": "urn:ex/vav-503",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-534-duct-after-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-503-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-ra-damper",
-        "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+                "@id": "urn:ex/vav-503-air-out"
+            },
             {
-                "@id": "urn:ex/office-ahu-ra-damper-in"
+                "@id": "urn:ex/vav-503-hot-water-in"
             },
             {
-                "@id": "urn:ex/office-ahu-ra-damper-out"
+                "@id": "urn:ex/vav-503-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/office-ahu-ra-damper-command"
+                "@id": "urn:ex/vav-503-damper"
             },
             {
-                "@id": "urn:ex/office-ahu-ra-damper-position"
+                "@id": "urn:ex/vav-503-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-503-reheat-coil-valve"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-203-window-switch-on-off",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Return"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-513-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-313-hvac-domain",
+        "@id": "urn:ex/vav-527-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-313-in"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/room-313-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-540-hot-water-in-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-hot-water-out",
+        "@id": "urn:ex/vav-508-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-526-hot-water-out-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-discharge-air-flow-sensor",
+        "@id": "urn:ex/zone-312-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-509-air-in"
+                "@id": "urn:ex/room-312-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-509-discharge-air-flow"
+                "@id": "urn:ex/zone-312-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-reheat-coil-air-out",
+        "@id": "urn:ex/vav-503-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-311"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -7724,405 +7743,323 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-535-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-535-more-heat-requests"
-            }
-        ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-535-air-out"
+                "@id": "urn:ex/vav-503-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-reheat-coil-air-in",
+        "@id": "urn:ex/vav-525-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-513-duct-after-damper"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-clg-coil-valve-position",
+        "@id": "urn:ex/vav-504-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/vav-504-reheat-coil-valve-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-504-reheat-coil-valve-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-501-damper-position",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-504-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-504-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-539-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-514-pipe-hot-water-return-before-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-105-out",
+        "@id": "urn:ex/vav-533-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-air-in",
+        "@id": "urn:ex/vav-515-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-502-pipe-hot-water-return-before-valve",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-113-temp-sensor",
+        "@id": "urn:ex/zone-118-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-113-hvac-domain"
+                "@id": "urn:ex/room-118-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-113-temp"
+                "@id": "urn:ex/zone-118-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-discharge-air-temp",
+        "@id": "urn:ex/vav-504-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-110-out",
+        "@id": "urn:ex/vav-535-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/connection-to-room-311"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-106-hvac-domain",
-        "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/room-106-in"
+                "@id": "urn:ex/vav-535-heating-pid-output"
             },
             {
-                "@id": "urn:ex/room-106-out"
+                "@id": "urn:ex/vav-535-more-heat-requests"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-535-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-discharge-air-temp-sensor",
+        "@id": "urn:ex/connection-to-room-212",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/vav-502-air-out"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-502-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-515-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-531-air-in"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-531-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-reheat-coil-valve",
+        "@id": "urn:ex/vav-536-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-530-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-530-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-536-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-530-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-530-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-536-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-110",
+        "@id": "urn:ex/vav-534-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/room-110-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-110-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-110-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-110-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-110-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-110-temp"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-110-window-switch-on-off"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-hot-water-out-connection",
+        "@id": "urn:ex/room-111-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-213-occupancy",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-damper-command",
+        "@id": "urn:ex/vav-538-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-538-duct-after-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-damper-command",
+        "@id": "urn:ex/vav-532-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-damper-in",
+        "@id": "urn:ex/zone-118-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-538-reheat-coil-valve-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-538-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-502-air-in"
+                "@id": "urn:ex/vav-538-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-damper",
+        "@id": "urn:ex/vav-501-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-525-damper-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-525-damper-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-525-damper-command"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-525-damper-position"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil-water-out",
+        "@id": "urn:ex/vav-534-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-534-pipe-hot-water-return-before-valve"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -8131,72 +8068,53 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-510-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-540-hot-water-out-connection"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-510-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-540-hot-water-out"
+                "@id": "urn:ex/vav-510-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-reheat-coil-water-in",
+        "@id": "urn:ex/vav-518-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-523-hot-water-in-connection"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-523-hot-water-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/room-209-in",
+        "@id": "urn:ex/vav-518-reheat-coil-valve-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-208-209"
+                "@id": "urn:ex/vav-518-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-discharge-air-temp",
+        "@id": "urn:ex/vav-537-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -8210,56 +8128,57 @@
         ]
     },
     {
-        "@id": "urn:ex/room-111-out",
+        "@id": "urn:ex/vav-535-hot-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-535-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-occupancy",
+        "@id": "urn:ex/office-ahu-sa-fan-speed-status",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-214-temp-sensor",
+        "@id": "urn:ex/connection-to-room-210",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/room-214-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-214-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-damper-in",
+        "@id": "urn:ex/vav-516-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/connection-to-room-201"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -8267,14 +8186,23 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-517-air-in"
+                "@id": "urn:ex/vav-516-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-516-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-516-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-516-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-damper-position",
+        "@id": "urn:ex/vav-533-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -8290,68 +8218,60 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/room-112",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-112-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-cooling-pid-output",
+        "@id": "urn:ex/vav-513-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-513-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-513-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-513-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-513-reheat-coil-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-discharge-air-flow",
+        "@id": "urn:ex/vav-527-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-536-duct-after-damper",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-duct-after-moisture-eliminator",
+        "@id": "urn:ex/office-ahu-duct-after-ra-fan",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -8363,159 +8283,125 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-501-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-513-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-501-pipe-hot-water-return-before-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-air-out",
+        "@id": "urn:ex/zone-110",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/connection-to-room-105"
+                "@id": "urn:ex/room-110-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-504-discharge-air-flow"
+                "@id": "urn:ex/zone-110-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-504-discharge-air-flow-setpoint"
+                "@id": "urn:ex/zone-110-heating-setpoint"
             },
             {
-                "@id": "urn:ex/vav-504-discharge-air-temp"
+                "@id": "urn:ex/zone-110-occupancy"
             },
             {
-                "@id": "urn:ex/vav-504-discharge-air-temp-setpoint"
+                "@id": "urn:ex/zone-110-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-110-temp"
+            },
+            {
+                "@id": "urn:ex/zone-110-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-213-cooling-setpoint",
+        "@id": "urn:ex/office-ahu-htg-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/office-ahu-htg-coil-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/office-ahu-htg-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-damper-actuator",
+        "@id": "urn:ex/vav-523-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-540-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
-            {
-                "@id": "urn:ex/vav-540-damper-command"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-513-reheat-coil-valve-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-513-reheat-coil-valve"
-            }
-        ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-513-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-cooling-pid-output",
+        "@id": "urn:ex/room-102",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/room-102-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-106-107-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil",
+        "@id": "urn:ex/vav-502-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-529-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-529-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-529-reheat-coil-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-529-reheat-coil-water-out"
+                "@id": "urn:ex/vav-502-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-damper-command",
+        "@id": "urn:ex/vav-530-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -8531,30 +8417,23 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-509-damper",
+        "@id": "urn:ex/vav-517-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-509-damper-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-509-damper-out"
+                "@id": "urn:ex/vav-517-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-509-damper-command"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-509-damper-position"
+                "@id": "urn:ex/vav-517-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-313-occupancy-override",
+        "@id": "urn:ex/zone-305-occupancy-override",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -8565,46 +8444,44 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-532-hot-water-out-connection",
+        "@id": "urn:ex/vav-502-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-302",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-302-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-reheat-coil-valve-actuator",
+        "@id": "urn:ex/zone-207-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-505-reheat-coil-valve"
+                "@id": "urn:ex/room-207-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-505-reheat-coil-valve-command"
+                "@id": "urn:ex/zone-207-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-210-window-switch-on-off",
+        "@id": "urn:ex/zone-201-window-switch-on-off",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -8615,108 +8492,108 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-302-co2-sensor",
+        "@id": "urn:ex/vav-526-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-302-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-302-co2-concentration"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-511-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-508-hot-water-out-connection"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-508-hot-water-out"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil",
+        "@id": "urn:ex/vav-535-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-534-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-534-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-534-reheat-coil-water-in"
+                "@id": "urn:ex/vav-535-damper-in"
             },
             {
-                "@id": "urn:ex/vav-534-reheat-coil-water-out"
+                "@id": "urn:ex/vav-535-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/vav-535-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-535-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-damper-actuator",
+        "@id": "urn:ex/zone-101-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-529-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-529-damper-command"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-304-out",
+        "@id": "urn:ex/vav-531-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-531-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-531-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-531-cooling-pid-output"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-damper-out",
+        "@id": "urn:ex/vav-501-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-509-duct-after-damper"
+                "@id": "urn:ex/connection-to-room-102"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -8726,113 +8603,112 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-509-colder-supply-air-requests"
+                "@id": "urn:ex/vav-501-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-509-cooling-pid-output"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-512-more-heat-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-501-more-heat-requests"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-107",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/room-107-hvac-domain"
+                "@id": "urn:ex/vav-501-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-117",
+        "@id": "urn:ex/connection-to-room-204-205",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-117-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506",
+        "@id": "urn:ex/vav-505-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-506-air-in"
+                "@id": "urn:ex/vav-505-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-506-air-out"
+                "@id": "urn:ex/vav-505-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-506-hot-water-in"
+                "@id": "urn:ex/vav-505-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-506-hot-water-out"
+                "@id": "urn:ex/vav-505-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-506-damper"
-            },
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-511-discharge-air-flow",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-506-reheat-coil"
-            },
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-506-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-colder-supply-air-requests",
+        "@id": "urn:ex/room-117",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/room-117-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-523-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-527-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-507-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-527-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -8842,615 +8718,660 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-207-occupancy-sensor",
+        "@id": "urn:ex/vav-511-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-207-hvac-domain"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-207-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-301",
+        "@id": "urn:ex/vav-507-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-301-hvac-domain"
+                "@id": "urn:ex/connection-to-room-110"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-301-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-301-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-301-occupancy"
+                "@id": "urn:ex/vav-507-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/zone-301-occupancy-override"
+                "@id": "urn:ex/vav-507-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/zone-301-temp"
+                "@id": "urn:ex/vav-507-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/zone-301-window-switch-on-off"
+                "@id": "urn:ex/vav-507-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-discharge-air-temp-setpoint",
+        "@id": "urn:ex/room-303",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/room-303-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-215",
+        "@id": "urn:ex/vav-512",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/room-215-hvac-domain"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
-            }
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/zone-215-cooling-setpoint"
+                "@id": "urn:ex/vav-512-air-in"
             },
             {
-                "@id": "urn:ex/zone-215-heating-setpoint"
+                "@id": "urn:ex/vav-512-air-out"
             },
             {
-                "@id": "urn:ex/zone-215-occupancy"
+                "@id": "urn:ex/vav-512-hot-water-in"
             },
             {
-                "@id": "urn:ex/zone-215-occupancy-override"
+                "@id": "urn:ex/vav-512-hot-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:ex/vav-512-damper"
             },
             {
-                "@id": "urn:ex/zone-215-temp"
+                "@id": "urn:ex/vav-512-reheat-coil"
             },
             {
-                "@id": "urn:ex/zone-215-window-switch-on-off"
+                "@id": "urn:ex/vav-512-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-111-occupancy-override",
+        "@id": "urn:ex/connection-to-room-103",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-damper-in",
+        "@id": "urn:ex/vav-519-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-519-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-519-reheat-coil-valve-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-531-air-in"
+                "@id": "urn:ex/vav-519-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-519-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-312",
+        "@id": "urn:ex/room-307-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-312-hvac-domain"
+                "@id": "urn:ex/room-307-in"
+            },
+            {
+                "@id": "urn:ex/room-307-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasDomain": [
             {
                 "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-312-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-312-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-312-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-312-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-312-temp"
-            },
-            {
-                "@id": "urn:ex/zone-312-window-switch-on-off"
-            }
         ]
     },
     {
-        "@id": "urn:ex/zone-211-temp",
+        "@id": "urn:ex/vav-530-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-air-out",
+        "@id": "urn:ex/vav-535-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/connection-to-room-211"
+                "@id": "urn:ex/vav-535-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-535-discharge-air-flow"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-525-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-525-discharge-air-flow"
+                "@id": "urn:ex/vav-525-damper-in"
             },
             {
-                "@id": "urn:ex/vav-525-discharge-air-flow-setpoint"
-            },
+                "@id": "urn:ex/vav-525-damper-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-525-discharge-air-temp"
+                "@id": "urn:ex/vav-525-damper-command"
             },
             {
-                "@id": "urn:ex/vav-525-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-525-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-208-209",
+        "@id": "urn:ex/vav-520-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/room-208-hvac-domain"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-209-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-530-hot-water-out-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-536-damper-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-536-duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-208-209-cooling-setpoint"
+                "@id": "urn:ex/vav-536-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/zone-208-209-heating-setpoint"
+                "@id": "urn:ex/vav-536-cooling-pid-output"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-ra-temp-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:ex/office-ahu-ra-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/office-ahu-ra-temp"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-sa-fan",
+        "@type": [
+            "http://data.ashrae.org/standard223#Fan",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#FanWithVFD"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/office-ahu-sa-fan-in"
             },
             {
-                "@id": "urn:ex/zone-208-209-occupancy"
+                "@id": "urn:ex/office-ahu-sa-fan-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/office-ahu-sa-fan-power"
             },
             {
-                "@id": "urn:ex/zone-208-209-occupancy-override"
+                "@id": "urn:ex/office-ahu-sa-fan-speed-cmd"
             },
             {
-                "@id": "urn:ex/zone-208-209-temp"
+                "@id": "urn:ex/office-ahu-sa-fan-speed-status"
             },
             {
-                "@id": "urn:ex/zone-208-209-window-switch-on-off"
+                "@id": "urn:ex/office-ahu-sa-fan-start-cmd"
+            },
+            {
+                "@id": "urn:ex/office-ahu-sa-fan-start-status"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Supply"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-207-occupancy",
+        "@id": "urn:ex/zone-212-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529",
+        "@id": "urn:ex/vav-538",
         "@type": [
             "http://data.ashrae.org/standard223#SingleDuctTerminal",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-529-air-in"
+                "@id": "urn:ex/vav-538-air-in"
             },
             {
-                "@id": "urn:ex/vav-529-air-out"
+                "@id": "urn:ex/vav-538-air-out"
             },
             {
-                "@id": "urn:ex/vav-529-hot-water-in"
+                "@id": "urn:ex/vav-538-hot-water-in"
             },
             {
-                "@id": "urn:ex/vav-529-hot-water-out"
+                "@id": "urn:ex/vav-538-hot-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-529-damper"
+                "@id": "urn:ex/vav-538-damper"
             },
             {
-                "@id": "urn:ex/vav-529-reheat-coil"
+                "@id": "urn:ex/vav-538-reheat-coil"
             },
             {
-                "@id": "urn:ex/vav-529-reheat-coil-valve"
+                "@id": "urn:ex/vav-538-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil-valve-command",
+        "@id": "urn:ex/zone-213-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/room-213-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/zone-213-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-heating-pid-output",
+        "@id": "urn:ex/office-ahu-moisture-eliminator-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/office-ahu-duct-after-moisture-eliminator"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-105",
+        "@id": "urn:ex/vav-534-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-105-hvac-domain"
+                "@id": "urn:ex/vav-534-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-534-discharge-air-temp"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-501-damper-command",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-105-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-105-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-105-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-105-occupancy-override"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/zone-105-temp"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-105-window-switch-on-off"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-309-in",
+        "@id": "urn:ex/vav-528-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-309-310"
+                "@id": "urn:ex/vav-528-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-528-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-air-in",
+        "@id": "urn:ex/vav-508-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-discharge-air-temp",
+        "@id": "urn:ex/vav-538-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/vav-538-duct-after-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-538-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-538-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531",
+        "@id": "urn:ex/vav-526-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-531-air-in"
+                "@id": "urn:ex/vav-526-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-531-air-out"
+                "@id": "urn:ex/vav-526-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-531-hot-water-in"
+                "@id": "urn:ex/vav-526-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-531-hot-water-out"
+                "@id": "urn:ex/vav-526-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-531-damper"
-            },
-            {
-                "@id": "urn:ex/vav-531-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-531-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-522-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-212-temp-sensor",
+        "@id": "urn:ex/vav-502-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-212-hvac-domain"
+                "@id": "urn:ex/vav-502-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-212-temp"
+                "@id": "urn:ex/vav-502-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-discharge-air-flow",
+        "@id": "urn:ex/vav-532-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil-valve-command",
+        "@id": "urn:ex/zone-115-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/room-115-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/zone-115-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-air-out",
+        "@id": "urn:ex/vav-521-reheat-coil-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-212"
+                "@id": "urn:ex/vav-521-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-527-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-526-discharge-air-flow"
+                "@id": "urn:ex/vav-527-damper-in"
             },
             {
-                "@id": "urn:ex/vav-526-discharge-air-flow-setpoint"
-            },
+                "@id": "urn:ex/vav-527-damper-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-526-discharge-air-temp"
+                "@id": "urn:ex/vav-527-damper-command"
             },
             {
-                "@id": "urn:ex/vav-526-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-527-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-heating-pid-output",
+        "@id": "urn:ex/vav-540-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-540-duct-after-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-540-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-540-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-109-hvac-domain",
+        "@id": "urn:ex/vav-523-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-109-in"
-            },
-            {
-                "@id": "urn:ex/room-109-out"
+                "@id": "urn:ex/vav-523-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-106-out",
+        "@id": "urn:ex/vav-520-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-hot-water-out-connection",
+        "@id": "urn:ex/vav-507-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -9462,30 +9383,26 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-533-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-512-pipe-hot-water-return-before-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-reheat-coil-water-out",
+        "@id": "urn:ex/vav-526-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-517-pipe-hot-water-return-before-valve"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -9494,51 +9411,50 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-202-temp-sensor",
+        "@id": "urn:ex/vav-521-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-202-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-202-temp"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-202-in",
+        "@id": "urn:ex/vav-513-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-202"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/zone-101-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-207-temp",
+        "@id": "urn:ex/zone-112-114-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -9554,34 +9470,42 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-516-more-heat-requests",
+        "@id": "urn:ex/zone-309-310-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-damper-actuator",
+        "@id": "urn:ex/room-113-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-524-damper"
+                "@id": "urn:ex/room-113-in"
+            },
+            {
+                "@id": "urn:ex/room-113-out"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-524-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-heating-pid-output",
+        "@id": "urn:ex/vav-509-cooling-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -9597,131 +9521,151 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-312-occupancy-override",
+        "@id": "urn:ex/zone-314-occupancy",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil-valve-out",
+        "@id": "urn:ex/zone-111-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-533-hot-water-out-connection"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-533-hot-water-out"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-air-out",
+        "@id": "urn:ex/vav-508-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/connection-to-room-118"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-512-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-512-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-512-discharge-air-temp"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-512-discharge-air-temp-setpoint"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-valve",
+        "@id": "urn:ex/vav-518-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-532-reheat-coil-valve-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-532-reheat-coil-valve-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-531-damper-command",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-532-reheat-coil-valve-command"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-528-reheat-coil",
+        "@type": [
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-528-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-532-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-528-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-528-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-528-reheat-coil-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-525-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-hot-water-in",
+        "@id": "urn:ex/vav-502-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-538-hot-water-in-connection"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-air-out",
+        "@id": "urn:ex/vav-526-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-204-205"
+                "@id": "urn:ex/connection-to-room-212"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -9731,44 +9675,48 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-519-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-519-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-526-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-519-discharge-air-temp"
-            },
+                "@id": "urn:ex/vav-526-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-519-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-526-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-damper-in",
+        "@id": "urn:ex/vav-521-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-521-reheat-coil-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-521-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-521-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-521-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-522-air-in"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-fan-in",
+        "@id": "urn:ex/room-308-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
@@ -9779,54 +9727,75 @@
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/office-ahu-ra-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/room-106-in",
+        "@id": "urn:ex/room-110-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-106-107"
+                "@id": "urn:ex/room-110-in"
+            },
+            {
+                "@id": "urn:ex/room-110-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-313-out",
+        "@id": "urn:ex/vav-515-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-515-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-515-reheat-coil-valve-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-515-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-515-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-discharge-air-temp",
+        "@id": "urn:ex/zone-214-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/room-214-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-214-occupancy"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-106-107-cooling-setpoint",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -9840,58 +9809,76 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-518-damper-actuator",
+        "@id": "urn:ex/vav-526-reheat-coil-valve-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-518-damper"
+                "@id": "urn:ex/vav-526-reheat-coil-valve"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-518-damper-command"
+                "@id": "urn:ex/vav-526-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-damper-position",
+        "@id": "urn:ex/room-104-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/connection-to-room-104"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-discharge-air-temp-sensor",
+        "@id": "urn:ex/room-201-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-503-air-out"
+                "@id": "urn:ex/room-201-in"
+            },
+            {
+                "@id": "urn:ex/room-201-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-503-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-duct-after-damper",
+        "@id": "urn:ex/zone-206-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-215-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/connection-to-room-215"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -9900,23 +9887,35 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-101-building-static-pressure-setpoint",
+        "@id": "urn:ex/vav-538-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-526-hot-water-out-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-112-114-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -9932,114 +9931,96 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-511-damper-position",
+        "@id": "urn:ex/vav-505-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-505-air-in"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-505-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-damper-actuator",
+        "@id": "urn:ex/vav-502-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-509-damper"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-509-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-reheat-coil",
+        "@id": "urn:ex/room-308-in",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-513-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-513-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-513-reheat-coil-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-513-reheat-coil-water-out"
+                "@id": "urn:ex/connection-to-room-307-308"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-discharge-air-temp",
+        "@id": "urn:ex/zone-305-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/room-305-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/zone-305-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil-valve",
+        "@id": "urn:ex/vav-512-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-515-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-515-reheat-coil-valve-out"
+                "@id": "urn:ex/connection-to-room-118"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-515-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-512-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-515-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-512-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-512-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-208-209-cooling-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -10055,199 +10036,173 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-535-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-514-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-514-hot-water-out-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-colder-supply-air-requests",
+        "@id": "urn:ex/room-214",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/room-214-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil-water-out",
+        "@id": "urn:ex/vav-526-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-521-pipe-hot-water-return-before-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-309-310-window-switch-on-off",
+        "@id": "urn:ex/vav-534",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-htg-coil-valve-command",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/vav-534-air-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-534-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-534-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-534-hot-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-534-damper"
+            },
+            {
+                "@id": "urn:ex/vav-534-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-534-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-cooling-pid-output",
+        "@id": "urn:ex/vav-535-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-212",
+        "@id": "urn:ex/vav-528-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-528-pipe-hot-water-return-before-valve"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512",
+        "@id": "urn:ex/vav-513-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-512-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-512-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-512-hot-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-512-hot-water-out"
+                "@id": "urn:ex/vav-513-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-512-damper"
-            },
-            {
-                "@id": "urn:ex/vav-512-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-512-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-hot-water-out",
+        "@id": "urn:ex/room-110",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-509-hot-water-out-connection"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-110-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-heating-pid-output",
+        "@id": "urn:ex/vav-537-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-air-out",
+        "@id": "urn:ex/vav-514-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-116-117"
+                "@id": "urn:ex/vav-514-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-515-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-515-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-515-discharge-air-temp"
-            },
-            {
-                "@id": "urn:ex/vav-515-discharge-air-temp-setpoint"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-501-discharge-air-flow-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -10263,113 +10218,63 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-101-window-switch-on-off",
+        "@id": "urn:ex/zone-214-occupancy-override",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-307-308",
+        "@id": "urn:ex/vav-506-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/room-307-hvac-domain"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-308-hvac-domain"
+                "@id": "urn:ex/connection-to-room-106-107"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-307-308-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-307-308-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-307-308-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-307-308-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-307-308-temp"
+                "@id": "urn:ex/vav-506-heating-pid-output"
             },
             {
-                "@id": "urn:ex/zone-307-308-window-switch-on-off"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-524-hot-water-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-524-hot-water-out-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-506-more-heat-requests"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-307-308-occupancy-override",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:ex/vav-506-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-valve",
+        "@id": "urn:ex/vav-501-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-526-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-526-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-501-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-526-reheat-coil-valve-command"
-            },
-            {
-                "@id": "urn:ex/vav-526-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-531-reheat-coil-valve-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -10385,61 +10290,53 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-202-heating-setpoint",
+        "@id": "urn:ex/zone-101-co2-concentration-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#ofSubstance": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Substance-CO2"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-526-reheat-coil-valve-command",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/MoleFraction"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/PPM"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-205-in",
+        "@id": "urn:ex/room-205-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-204-205"
+                "@id": "urn:ex/room-205-in"
+            },
+            {
+                "@id": "urn:ex/room-205-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-311-in",
+        "@id": "urn:ex/room-110-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-311"
+                "@id": "urn:ex/connection-to-room-110"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -10449,106 +10346,67 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-511",
+        "@id": "urn:ex/vav-525-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-511-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-511-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-511-hot-water-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-511-hot-water-out"
+                "@id": "urn:ex/vav-525-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-511-damper"
-            },
-            {
-                "@id": "urn:ex/vav-511-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-511-reheat-coil-valve"
+                "@id": "urn:ex/vav-525-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-damper-out",
+        "@id": "urn:ex/vav-528-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-539-duct-after-damper"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-539-colder-supply-air-requests"
-            },
-            {
-                "@id": "urn:ex/vav-539-cooling-pid-output"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-106-107-window-switch-on-off",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil-air-in",
+        "@id": "urn:ex/vav-540-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-512-duct-after-damper"
+                "@id": "urn:ex/vav-540-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-531-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-533-air-in"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-533-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-discharge-air-temp",
+        "@id": "urn:ex/vav-519-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -10569,31 +10427,10 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-525-discharge-air-temp-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/vav-525-air-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:ex/vav-525-discharge-air-temp"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-510-discharge-air-temp",
+        "@id": "urn:ex/zone-104-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
                 "@id": "http://qudt.org/vocab/quantitykind/Temperature"
@@ -10606,226 +10443,202 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-501-colder-supply-air-requests",
+        "@id": "urn:ex/vav-504-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/connection-to-room-105"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-519-damper",
-        "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-519-damper-in"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-519-damper-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-519-damper-command"
+                "@id": "urn:ex/vav-504-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-519-damper-position"
+                "@id": "urn:ex/vav-504-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-504-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-504-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-heating-pid-output",
+        "@id": "urn:ex/vav-537-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-521-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-512-air-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-512-discharge-air-temp"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-528-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-517-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-517-duct-after-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-reheat-coil",
+        "@id": "urn:ex/vav-502-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-523-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-523-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-523-reheat-coil-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-523-reheat-coil-water-out"
+                "@id": "urn:ex/vav-502-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-reheat-coil-valve-actuator",
+        "@id": "urn:ex/office-ahu-clg-coil-valve-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-522-reheat-coil-valve"
+                "@id": "urn:ex/office-ahu-clg-coil-valve"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-522-reheat-coil-valve-command"
+                "@id": "urn:ex/office-ahu-clg-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-hot-water-out-connection",
+        "@id": "urn:ex/vav-532-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-524-duct-after-damper",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-damper-actuator",
+        "@id": "urn:ex/vav-510-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-517-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-517-damper-command"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-hot-water-in-connection",
+        "@id": "urn:ex/vav-537-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-hot-water-in",
+        "@id": "urn:ex/vav-512-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-529-hot-water-in-connection"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-108-occupancy-override",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-damper-in",
+        "@id": "urn:ex/vav-520-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -10841,18 +10654,18 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-503-air-in"
+                "@id": "urn:ex/vav-520-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-damper-in",
+        "@id": "urn:ex/vav-539-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/connection-to-room-214"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -10860,334 +10673,323 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-539-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-539-more-heat-requests"
+            }
+        ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-528-air-in"
+                "@id": "urn:ex/vav-539-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-discharge-air-flow",
+        "@id": "urn:ex/vav-520-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/vav-520-duct-after-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/vav-520-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-520-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-501-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-colder-supply-air-requests",
+        "@id": "urn:ex/vav-515-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-hot-water-out",
+        "@id": "urn:ex/vav-508-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-518-hot-water-out-connection"
+                "@id": "urn:ex/connection-to-room-109"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-205",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/room-205-hvac-domain"
+                "@id": "urn:ex/vav-508-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-508-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-508-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-508-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-water-out",
+        "@id": "urn:ex/zone-214-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-529-pipe-hot-water-return-before-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil-water-out",
+        "@id": "urn:ex/room-314",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-511-pipe-hot-water-return-before-valve"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-314-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil-valve",
+        "@id": "urn:ex/vav-531-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-521-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-521-reheat-coil-valve-out"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "urn:ex/vav-531-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-521-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-521-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-531-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-damper-out",
+        "@id": "urn:ex/vav-517-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-duct-after-oa-ra-damper"
+                "@id": "urn:ex/vav-517-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-517-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-517-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-517-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-118-temp",
+        "@id": "urn:ex/vav-520-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-reheat-coil-air-in",
+        "@id": "urn:ex/vav-503-reheat-coil-valve-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-517-duct-after-damper"
+                "@id": "urn:ex/vav-503-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-524-more-heat-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-heating-pid-output",
+        "@id": "urn:ex/room-201-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/connection-to-room-201"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-530-damper-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-540-reheat-coil-valve"
+                "@id": "urn:ex/vav-530-damper"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-540-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-530-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-cooling-pid-output",
+        "@id": "urn:ex/vav-530",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/vav-530-air-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-528-air-in",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+                "@id": "urn:ex/vav-530-air-out"
+            },
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-530-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-530-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-530-damper"
+            },
+            {
+                "@id": "urn:ex/vav-530-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-530-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-528-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-208-209-window-switch-on-off",
+        "@id": "urn:ex/vav-537-colder-supply-air-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-311-temp-sensor",
+        "@id": "urn:ex/zone-208-209-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-311-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-311-temp"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-valve-in",
+        "@id": "urn:ex/room-305-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-526-pipe-hot-water-return-before-valve"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/connection-to-room-305"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-duct-after-htg-coil",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -11196,7 +10998,7 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-303-304-306-temp",
+        "@id": "urn:ex/zone-307-308-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -11212,121 +11014,100 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-516-damper-command",
+        "@id": "urn:ex/zone-103-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/room-103-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/zone-103-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-reheat-coil-water-out",
+        "@id": "urn:ex/vav-538-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-513-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-538-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-538-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-538-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-538-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-101",
+        "@id": "urn:ex/vav-534-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-101-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-515",
+        "@type": [
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-101-building-static-pressure"
-            },
-            {
-                "@id": "urn:ex/zone-101-building-static-pressure-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-101-co2-concentration"
-            },
-            {
-                "@id": "urn:ex/zone-101-co2-concentration-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-101-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-101-heating-setpoint"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/zone-101-occupancy"
+                "@id": "urn:ex/vav-515-air-in"
             },
             {
-                "@id": "urn:ex/zone-101-occupancy-override"
+                "@id": "urn:ex/vav-515-air-out"
             },
             {
-                "@id": "urn:ex/zone-101-temp"
+                "@id": "urn:ex/vav-515-hot-water-in"
             },
             {
-                "@id": "urn:ex/zone-101-window-switch-on-off"
+                "@id": "urn:ex/vav-515-hot-water-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-519-reheat-coil-water-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-519-pipe-hot-water-return-before-valve"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-515-damper"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-109",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
-        ],
-        "http://data.ashrae.org/standard223#encloses": [
+                "@id": "urn:ex/vav-515-reheat-coil"
+            },
             {
-                "@id": "urn:ex/room-109-hvac-domain"
+                "@id": "urn:ex/vav-515-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-air-out",
+        "@id": "urn:ex/vav-501-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-309-310"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -11334,23 +11115,14 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-532-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-532-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-532-discharge-air-temp"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-532-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-501-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-damper-command",
+        "@id": "urn:ex/office-ahu-sa-fan-speed-cmd",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -11366,143 +11138,145 @@
         ]
     },
     {
-        "@id": "urn:ex/room-208",
+        "@id": "urn:ex/vav-503-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-208-hvac-domain"
+                "@id": "urn:ex/vav-503-air-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-503-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-reheat-coil-valve-actuator",
+        "@id": "urn:ex/room-114-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-537-reheat-coil-valve"
+                "@id": "urn:ex/connection-to-room-112-114"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-537-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-more-heat-requests",
+        "@id": "urn:ex/vav-504-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-518-colder-supply-air-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-damper",
+        "@id": "urn:ex/vav-511-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-524-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-524-damper-out"
+                "@id": "urn:ex/vav-511-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-524-damper-command"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-524-damper-position"
+                "@id": "urn:ex/vav-511-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-534-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-534-air-in"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/vav-534-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-204-205-temp",
+        "@id": "urn:ex/vav-503-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-discharge-air-flow",
+        "@id": "urn:ex/vav-515-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-515-air-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/vav-515-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-more-heat-requests",
+        "@id": "urn:ex/vav-509-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-509-hot-water-out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-214-out",
+        "@id": "urn:ex/room-204-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -11518,99 +11292,111 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-530-colder-supply-air-requests",
+        "@id": "urn:ex/vav-519-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-discharge-air-flow",
+        "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#EnumerationKind"
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-511-colder-supply-air-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-duct-after-damper",
+        "@id": "urn:ex/vav-519-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-519-reheat-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-519-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-reheat-coil-valve-command",
+        "@id": "urn:ex/zone-212-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-fan-speed-status",
+        "@id": "urn:ex/zone-112-114-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-524-discharge-air-temp-setpoint",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-312-out",
+        "@id": "urn:ex/zone-112-114-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/room-112-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/zone-112-114-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-502-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -11622,23 +11408,23 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-528-damper-command",
+        "@id": "urn:ex/vav-530-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-312-cooling-setpoint",
+        "@id": "urn:ex/zone-118-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -11654,90 +11440,106 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-htg-coil-valve-in",
+        "@id": "urn:ex/vav-503-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-pipe-hot-water-return-before-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-313",
+        "@id": "urn:ex/vav-524-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-313-hvac-domain"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-503-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-526-hot-water-out-connection"
+                "@id": "urn:ex/vav-503-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-526-hot-water-out"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-damper-out",
+        "@id": "urn:ex/vav-503-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-511-duct-after-damper"
+                "@id": "urn:ex/vav-503-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-511-reheat-coil-water-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-511-colder-supply-air-requests"
-            },
+                "@id": "urn:ex/vav-511-pipe-hot-water-return-before-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-511-cooling-pid-output"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-104-window-switch-on-off",
+        "@id": "urn:ex/room-304-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "urn:ex/room-304-in"
+            },
+            {
+                "@id": "urn:ex/room-304-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-113-temp",
+        "@id": "urn:ex/zone-313-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -11753,96 +11555,82 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-537-reheat-coil-valve-in",
+        "@id": "urn:ex/zone-108-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-537-pipe-hot-water-return-before-valve"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-reheat-coil-air-out",
+        "@id": "urn:ex/vav-521-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-204-205"
+                "@id": "urn:ex/vav-521-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-519-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-519-more-heat-requests"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-519-air-out"
+                "@id": "urn:ex/vav-521-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-air-in",
+        "@id": "urn:ex/zone-313-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-damper-command",
+        "@id": "urn:ex/vav-509-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-509-reheat-coil-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-509-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-hot-water-in-connection",
+        "@id": "urn:ex/room-210-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/connection-to-room-210"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-cooling-pid-output",
+        "@id": "urn:ex/vav-512-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -11858,160 +11646,204 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-538-reheat-coil-air-in",
+        "@id": "urn:ex/vav-507",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-538-duct-after-damper"
+                "@id": "urn:ex/vav-507-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-507-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-507-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-507-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-507-damper"
+            },
+            {
+                "@id": "urn:ex/vav-507-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-507-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-colder-supply-air-requests",
+        "@id": "urn:ex/vav-501-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-501-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-501-reheat-coil-valve-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-501-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-501-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-reheat-coil-air-out",
+        "@id": "urn:ex/room-206",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/connection-to-room-213"
+                "@id": "urn:ex/room-206-hvac-domain"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-537-discharge-air-flow",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-538-heating-pid-output"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-538-more-heat-requests"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-538-air-out"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-more-heat-requests",
+        "@id": "urn:ex/zone-302-occupancy-override",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-307-308-cooling-setpoint",
+        "@id": "urn:ex/vav-510-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-510-hot-water-in-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-510-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-temp-sensor",
+        "@id": "urn:ex/vav-539-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-oa-damper-in"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/office-ahu-oa-temp"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-526-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-523-reheat-coil-valve"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-523-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-hot-water-out",
+        "@id": "urn:ex/vav-512-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-522-hot-water-out-connection"
+                "@id": "urn:ex/vav-512-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-512-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-512-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-reheat-coil-water-out",
+        "@id": "urn:ex/zone-110-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-507-pipe-hot-water-return-before-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-118-in",
+        "@id": "urn:ex/room-107-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-118"
+                "@id": "urn:ex/connection-to-room-106-107"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -12021,55 +11853,58 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-111-temp",
+        "@id": "urn:ex/vav-517-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-517-duct-after-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-517-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-517-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-reheat-coil",
+        "@id": "urn:ex/vav-512-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-525-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-525-reheat-coil-air-out"
-            },
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-525-reheat-coil-water-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-525-reheat-coil-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-hot-water-in",
+        "@id": "urn:ex/vav-529-hot-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-508-hot-water-in-connection"
+                "@id": "urn:ex/vav-529-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -12079,45 +11914,50 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-515-discharge-air-temp-sensor",
+        "@id": "urn:ex/zone-109-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-515-air-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-515-discharge-air-temp"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-102-cooling-setpoint",
+        "@id": "urn:ex/vav-503-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil-air-out",
+        "@id": "urn:ex/vav-502-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-118"
+                "@id": "urn:ex/connection-to-room-101"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -12127,30 +11967,41 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-512-heating-pid-output"
+                "@id": "urn:ex/vav-502-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-512-more-heat-requests"
+                "@id": "urn:ex/vav-502-more-heat-requests"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-512-air-out"
+                "@id": "urn:ex/vav-502-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil-valve",
+        "@id": "urn:ex/vav-533-colder-supply-air-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-520-reheat-coil-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Valve",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-511-reheat-coil-valve-in"
+                "@id": "urn:ex/vav-520-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/vav-511-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-520-reheat-coil-valve-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -12160,118 +12011,134 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-511-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-520-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-511-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-520-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-202-out",
+        "@id": "urn:ex/vav-502-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-502-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-502-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-502-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-502-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-damper-in",
+        "@id": "urn:ex/vav-525-discharge-air-flow",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-212-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/connection-to-room-212"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-501-air-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-discharge-air-temp",
+        "@id": "urn:ex/office-ahu-sa-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "http://data.ashrae.org/standard223#Role-Supply"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-hot-water-out-connection",
+        "@id": "urn:ex/zone-309-310-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-309-hvac-domain"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-517-colder-supply-air-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/zone-309-310-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-312-in",
+        "@id": "urn:ex/vav-509-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/connection-to-room-312"
+                "@id": "urn:ex/vav-509-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-509-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-539-reheat-coil-valve-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-527-hot-water-out-connection"
+                "@id": "urn:ex/vav-539-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -12281,37 +12148,50 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-527-hot-water-out"
+                "@id": "urn:ex/vav-539-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-111-hvac-domain",
+        "@id": "urn:ex/vav-535-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/room-111-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-532-discharge-air-flow",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/room-111-out"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-505-reheat-coil-valve-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-503-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-505-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -12321,62 +12201,45 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-531-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-511-hot-water-out-connection"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-511-hot-water-out"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil-valve",
+        "@id": "urn:ex/zone-309-310-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-516-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-516-reheat-coil-valve-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-516-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-516-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-116-in",
+        "@id": "urn:ex/vav-520-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-116-117"
+                "@id": "urn:ex/vav-520-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -12386,31 +12249,46 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-517-more-heat-requests",
+        "@id": "urn:ex/vav-522-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-colder-supply-air-requests",
+        "@id": "urn:ex/vav-535-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-fan-speed-cmd",
+        "@id": "urn:ex/vav-525-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -12424,25 +12302,40 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-503-duct-after-damper",
+        "@id": "urn:ex/zone-303-304-306-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-105-in",
+        "@id": "urn:ex/vav-506-hot-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-105"
+                "@id": "urn:ex/vav-506-hot-water-in-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-304-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -12452,25 +12345,30 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-htg-coil-valve-actuator",
+        "@id": "urn:ex/vav-535-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-htg-coil-valve"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/office-ahu-htg-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-535-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-540-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -12484,105 +12382,91 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil-valve-out",
+        "@id": "urn:ex/zone-211-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-503-hot-water-out-connection"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-211-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-503-hot-water-out"
+                "@id": "urn:ex/zone-211-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-305",
+        "@id": "urn:ex/vav-515-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/room-305-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-204",
+        "@id": "urn:ex/vav-537-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-204-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-reheat-coil-valve",
+        "@id": "urn:ex/vav-526-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-509-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-509-reheat-coil-valve-out"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-509-reheat-coil-valve-command"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-509-reheat-coil-valve-position"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-discharge-air-temp",
+        "@id": "urn:ex/room-106-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/room-106-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/room-106-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-clg-coil-air-in",
+        "@id": "urn:ex/office-ahu-ra-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-duct-after-htg-coil"
+                "@id": "urn:ex/office-ahu-duct-after-oa-ra-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -12592,107 +12476,94 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-211",
+        "@id": "urn:ex/vav-511-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-211-hvac-domain"
+                "@id": "urn:ex/vav-511-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-309-310-occupancy-override",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-211-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-211-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-211-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-211-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-211-temp"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/zone-211-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil",
+        "@id": "urn:ex/vav-539-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-521-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-521-reheat-coil-air-out"
-            },
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-521-reheat-coil-water-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-521-reheat-coil-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-114-hvac-domain",
+        "@id": "urn:ex/vav-530-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-114-in"
-            },
+                "@id": "urn:ex/vav-530-hot-water-out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-114-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-530-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-hot-water-in-connection",
+        "@id": "urn:ex/connection-to-room-207",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-htg-coil-water-out",
+        "@id": "urn:ex/vav-522-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-522-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -12702,98 +12573,77 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil-water-in",
+        "@id": "urn:ex/vav-506-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-536-hot-water-in-connection"
+                "@id": "urn:ex/vav-506-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-536-hot-water-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-533-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-503-discharge-air-flow-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-503-air-in"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-503-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-313-heating-setpoint",
+        "@id": "urn:ex/vav-524-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-524-hot-water-out-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-524-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-air-out",
+        "@id": "urn:ex/vav-505-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-106-107"
+                "@id": "urn:ex/connection-to-room-108"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -12803,270 +12653,217 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-506-discharge-air-flow"
+                "@id": "urn:ex/vav-505-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-506-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-505-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/vav-506-discharge-air-temp"
+                "@id": "urn:ex/vav-505-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/vav-506-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-505-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-damper-out",
+        "@id": "urn:ex/room-306-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-507-duct-after-damper"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-507-colder-supply-air-requests"
-            },
-            {
-                "@id": "urn:ex/vav-507-cooling-pid-output"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-519-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-506-air-out"
+                "@id": "urn:ex/vav-519-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-506-discharge-air-temp"
+                "@id": "urn:ex/vav-519-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil-valve",
+        "@id": "urn:ex/vav-518-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-512-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-512-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-518-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-512-reheat-coil-valve-command"
-            },
-            {
-                "@id": "urn:ex/vav-512-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-air-out",
+        "@id": "urn:ex/vav-536-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-303-304-306"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-529-heating-pid-output"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-529-more-heat-requests"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-529-air-out"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-112-hvac-domain",
+        "@id": "urn:ex/vav-519-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-112-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-112-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-302-out",
+        "@id": "urn:ex/zone-312",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/room-312-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-524-hot-water-in",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-524-hot-water-in-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/zone-312-cooling-setpoint"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/zone-312-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-312-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-312-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-312-temp"
+            },
+            {
+                "@id": "urn:ex/zone-312-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-207-cooling-setpoint",
+        "@id": "urn:ex/vav-523-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-reheat-coil-valve-in",
+        "@id": "urn:ex/zone-213",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-505-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/room-213-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-523-damper-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-523-damper"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-523-damper-command"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-533-reheat-coil-valve-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
+                "@id": "urn:ex/zone-213-cooling-setpoint"
+            },
             {
-                "@id": "urn:ex/vav-533-reheat-coil-valve"
-            }
-        ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+                "@id": "urn:ex/zone-213-heating-setpoint"
+            },
             {
-                "@id": "urn:ex/vav-533-reheat-coil-valve-command"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-522-discharge-air-temp",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+                "@id": "urn:ex/zone-213-occupancy"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/zone-213-occupancy-override"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/zone-213-temp"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/zone-213-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-cooling-pid-output",
+        "@id": "urn:ex/vav-537-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-537-hot-water-out-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-hot-water-in-connection",
+        "@id": "urn:ex/vav-514-hot-water-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -13078,13 +12875,13 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-523-reheat-coil-valve-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-531-hot-water-out-connection"
+                "@id": "urn:ex/vav-523-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -13094,92 +12891,112 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-531-hot-water-out"
+                "@id": "urn:ex/vav-523-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-312",
+        "@id": "urn:ex/vav-509-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-502-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-111",
+        "@id": "urn:ex/vav-528-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-214-temp",
+        "@id": "urn:ex/vav-536-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-536-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-536-reheat-coil-valve-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-536-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-536-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-damper-out",
+        "@id": "urn:ex/vav-509-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-513-duct-after-damper"
+                "@id": "urn:ex/vav-509-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-509-reheat-coil-valve-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-513-colder-supply-air-requests"
+                "@id": "urn:ex/vav-509-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-513-cooling-pid-output"
+                "@id": "urn:ex/vav-509-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-313-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -13195,64 +13012,41 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-212-occupancy",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-514-more-heat-requests",
+        "@id": "urn:ex/vav-509-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-502-hot-water-out-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-damper-in",
+        "@id": "urn:ex/office-ahu-oa-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/office-ahu-duct-after-oa-ra-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-534-air-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-damper-position",
+        "@id": "urn:ex/vav-517-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -13266,7 +13060,7 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-514-heating-pid-output",
+        "@id": "urn:ex/vav-522-cooling-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -13282,16 +13076,16 @@
         ]
     },
     {
-        "@id": "urn:ex/room-118-hvac-domain",
+        "@id": "urn:ex/room-109-hvac-domain",
         "@type": [
             "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-118-in"
+                "@id": "urn:ex/room-109-in"
             },
             {
-                "@id": "urn:ex/room-118-out"
+                "@id": "urn:ex/room-109-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasDomain": [
@@ -13301,258 +13095,249 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-fan-start-status",
+        "@id": "urn:ex/room-115-in",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "urn:ex/connection-to-room-115"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-302",
+        "@id": "urn:ex/zone-105-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-302-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-511-more-heat-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-302-co2-concentration"
-            },
-            {
-                "@id": "urn:ex/zone-302-co2-concentration-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-302-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-302-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-302-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-302-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-302-temp"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/zone-302-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-hot-water-in",
+        "@id": "urn:ex/vav-510-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-504-hot-water-in-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-damper",
+        "@id": "urn:ex/zone-111-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-518-damper-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-535-reheat-coil-valve-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-518-damper-out"
+                "@id": "urn:ex/vav-535-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-518-damper-command"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-518-damper-position"
+                "@id": "urn:ex/vav-535-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-214-occupancy",
+        "@id": "urn:ex/vav-508-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-damper-actuator",
+        "@id": "urn:ex/vav-510-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-530-damper"
+                "@id": "urn:ex/vav-510-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-530-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-clg-coil-valve",
+        "@id": "urn:ex/office-ahu-sa-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#ChilledWaterValve"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-clg-coil-valve-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/office-ahu-clg-coil-valve-out"
+                "@id": "urn:ex/office-ahu-sa-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-ChilledWater"
+                "@id": "urn:ex/office-ahu-sa-temp"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-501-reheat-coil-valve-command",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-clg-coil-valve-command"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/office-ahu-clg-coil-valve-position"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-co2-concentration",
+        "@id": "urn:ex/vav-514-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#ofSubstance": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Substance-CO2"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/MoleFraction"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PPM"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503",
+        "@id": "urn:ex/vav-505-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-503-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-503-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-503-hot-water-in"
+                "@id": "urn:ex/vav-505-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/vav-503-hot-water-out"
+                "@id": "urn:ex/vav-505-reheat-coil-valve-out"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-503-damper"
-            },
-            {
-                "@id": "urn:ex/vav-503-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-503-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-527-hot-water-in-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-505-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-505-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-heating-pid-output",
+        "@id": "urn:ex/vav-538-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-112-in",
+        "@id": "urn:ex/vav-539-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/connection-to-room-112-114"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-air-out",
+        "@id": "urn:ex/vav-522-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-313"
+                "@id": "urn:ex/connection-to-room-208-209"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -13562,27 +13347,26 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-536-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-536-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-522-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-536-discharge-air-temp"
-            },
+                "@id": "urn:ex/vav-522-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-536-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-522-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil-water-out",
+        "@id": "urn:ex/office-ahu-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-520-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/office-ahu-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -13592,29 +13376,29 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-502-damper-command",
+        "@id": "urn:ex/zone-211-cooling-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-521-reheat-coil-valve-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-531-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-521-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -13624,60 +13408,41 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-damper-actuator",
+        "@id": "urn:ex/vav-522-reheat-coil-valve-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/office-ahu-oa-damper"
+                "@id": "urn:ex/vav-522-reheat-coil-valve"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/office-ahu-oa-damper-command"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-202-hvac-domain",
-        "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-202-in"
-            },
-            {
-                "@id": "urn:ex/room-202-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-522-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-hot-water-out-connection",
+        "@id": "urn:ex/connection-to-room-110",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-109-in",
+        "@id": "urn:ex/vav-522-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-109"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -13687,41 +13452,57 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-517-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-527-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-517-pipe-hot-water-return-before-valve"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil-valve-actuator",
+        "@id": "urn:ex/zone-210-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-511-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-208-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-511-reheat-coil-valve-command"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-103-temp",
+        "@id": "urn:ex/zone-213-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -13735,9 +13516,9 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-529-damper-command",
+        "@id": "urn:ex/vav-530-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -13751,344 +13532,358 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-505-hot-water-out",
+        "@id": "urn:ex/connection-to-room-104",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-505-hot-water-out-connection"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-reheat-coil-air-in",
+        "@id": "urn:ex/office-ahu-htg-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-518-duct-after-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-heating-setpoint",
+        "@id": "urn:ex/vav-510-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-510-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-203-in",
+        "@id": "urn:ex/zone-113-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/connection-to-room-203"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-202-occupancy",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-505-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-519-air-in"
+                "@id": "urn:ex/vav-505-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-519-discharge-air-flow"
+                "@id": "urn:ex/vav-505-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-reheat-coil-air-out",
+        "@id": "urn:ex/vav-526-hot-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-101"
+                "@id": "urn:ex/vav-526-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-533-damper-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-502-heating-pid-output"
-            },
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-502-more-heat-requests"
+                "@id": "urn:ex/vav-533-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-502-air-out"
+                "@id": "urn:ex/vav-533-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-discharge-air-temp-sensor",
+        "@id": "urn:ex/office-ahu-ra-fan-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-534-air-out"
+                "@id": "urn:ex/office-ahu-duct-after-ra-fan"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-534-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil-air-in",
+        "@id": "urn:ex/vav-522-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-516-duct-after-damper"
+                "@id": "urn:ex/vav-522-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-112",
+        "@id": "urn:ex/zone-110-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/room-112-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-reheat-coil",
+        "@id": "urn:ex/vav-518",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-501-reheat-coil-air-in"
+                "@id": "urn:ex/vav-518-air-in"
             },
             {
-                "@id": "urn:ex/vav-501-reheat-coil-air-out"
+                "@id": "urn:ex/vav-518-air-out"
             },
             {
-                "@id": "urn:ex/vav-501-reheat-coil-water-in"
+                "@id": "urn:ex/vav-518-hot-water-in"
             },
             {
-                "@id": "urn:ex/vav-501-reheat-coil-water-out"
+                "@id": "urn:ex/vav-518-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/vav-518-damper"
+            },
+            {
+                "@id": "urn:ex/vav-518-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-518-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-air-in",
+        "@id": "urn:ex/zone-313",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/room-313-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/zone-313-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-313-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-313-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-313-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-313-temp"
+            },
+            {
+                "@id": "urn:ex/zone-313-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-damper-position",
+        "@id": "urn:ex/vav-520-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-reheat-coil-valve-out",
+        "@id": "urn:ex/room-117-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-509-hot-water-out-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/room-117-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-117-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-509-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-513-discharge-air-flow-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-303-304-306-occupancy-sensor",
+        "@id": "urn:ex/vav-531-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-303-hvac-domain"
+                "@id": "urn:ex/vav-531-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-303-304-306-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-air-out",
+        "@id": "urn:ex/vav-510-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-110"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-213-hvac-domain",
+        "@type": [
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-507-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-507-discharge-air-flow-setpoint"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-507-discharge-air-temp"
+                "@id": "urn:ex/room-213-in"
             },
             {
-                "@id": "urn:ex/vav-507-discharge-air-temp-setpoint"
+                "@id": "urn:ex/room-213-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/connection-to-room-112-114",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-314-heating-setpoint",
+        "@id": "urn:ex/vav-507-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-115-in",
+        "@id": "urn:ex/vav-531-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/connection-to-room-115"
+                "@id": "urn:ex/vav-531-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-531-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-509-discharge-air-flow-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -14104,256 +13899,227 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-513-hot-water-out-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-527-damper",
+        "@id": "urn:ex/vav-529-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-527-damper-in"
+                "@id": "urn:ex/vav-529-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/vav-527-damper-out"
+                "@id": "urn:ex/vav-529-reheat-coil-valve-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-527-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-527-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-303-hvac-domain",
-        "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/room-303-in"
+                "@id": "urn:ex/vav-529-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/room-303-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-529-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-duct-after-damper",
+        "@id": "urn:ex/vav-517-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-211-occupancy-sensor",
+        "@id": "urn:ex/zone-105-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-211-hvac-domain"
+                "@id": "urn:ex/room-105-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-211-occupancy"
+                "@id": "urn:ex/zone-105-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-510-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-510-air-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-510-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-203-window-switch-on-off",
+        "@id": "urn:ex/vav-533-more-heat-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-damper-out",
+        "@id": "urn:ex/vav-517-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-521-duct-after-damper"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-521-colder-supply-air-requests"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-521-cooling-pid-output"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-508-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/vav-526-air-in"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-526-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-304-hvac-domain",
+        "@id": "urn:ex/vav-504-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-304-in"
-            },
-            {
-                "@id": "urn:ex/room-304-out"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-531-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-503-reheat-coil-valve"
+                "@id": "urn:ex/connection-to-room-307-308"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-503-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-522-damper-command",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/vav-531-discharge-air-flow"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-531-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-531-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-531-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-reheat-coil-water-in",
+        "@id": "urn:ex/vav-538-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-535-hot-water-in-connection"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-535-hot-water-in"
+                "@id": "urn:ex/vav-538-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-duct-after-damper",
+        "@id": "urn:ex/vav-509-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-115-heating-setpoint",
+        "@id": "urn:ex/vav-520-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-520-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-520-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-520-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-520-reheat-coil-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-207-heating-setpoint",
+        "@id": "urn:ex/zone-201-cooling-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -14369,7 +14135,7 @@
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-201",
+        "@id": "urn:ex/vav-535-duct-after-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -14381,28 +14147,23 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-529-discharge-air-temp",
+        "@id": "urn:ex/vav-536-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-536-hot-water-out-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-damper-in",
+        "@id": "urn:ex/vav-515-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -14418,67 +14179,78 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-537-air-in"
+                "@id": "urn:ex/vav-515-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-101-co2-sensor",
+        "@id": "urn:ex/vav-511-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-101-hvac-domain"
+                "@id": "urn:ex/vav-511-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-101-co2-concentration"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-duct-after-damper",
+        "@id": "urn:ex/vav-523-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-discharge-air-temp",
+        "@id": "urn:ex/vav-525-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-502-heating-pid-output",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-hot-water-in",
+        "@id": "urn:ex/office-ahu-chilled-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-514-hot-water-in-connection"
+                "@id": "urn:ex/office-ahu-chilled-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -14488,29 +14260,40 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil-valve-position",
+        "@id": "urn:ex/room-209",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/room-209-hvac-domain"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-113-occupancy-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/room-113-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-113-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil-air-out",
+        "@id": "urn:ex/vav-506-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-314"
+                "@id": "urn:ex/connection-to-room-106-107"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -14520,64 +14303,83 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-534-heating-pid-output"
+                "@id": "urn:ex/vav-506-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-534-more-heat-requests"
+                "@id": "urn:ex/vav-506-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-506-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-506-discharge-air-temp-setpoint"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-301",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-534-air-out"
+                "@id": "urn:ex/room-301-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-113",
+        "@id": "urn:ex/room-107",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/room-113-hvac-domain"
+                "@id": "urn:ex/room-107-hvac-domain"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-502-damper-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-113-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-113-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-113-occupancy"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-113-occupancy-override"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/zone-113-temp"
-            },
+                "@id": "urn:ex/vav-502-air-in"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-504-hot-water-in-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-113-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-111",
+        "@id": "urn:ex/zone-311",
         "@type": [
             "http://data.ashrae.org/standard223#Zone",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/room-111-hvac-domain"
+                "@id": "urn:ex/room-311-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#hasDomain": [
@@ -14587,82 +14389,94 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-111-cooling-setpoint"
+                "@id": "urn:ex/zone-311-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/zone-111-heating-setpoint"
+                "@id": "urn:ex/zone-311-heating-setpoint"
             },
             {
-                "@id": "urn:ex/zone-111-occupancy"
+                "@id": "urn:ex/zone-311-occupancy"
             },
             {
-                "@id": "urn:ex/zone-111-occupancy-override"
+                "@id": "urn:ex/zone-311-occupancy-override"
             },
             {
-                "@id": "urn:ex/zone-111-temp"
+                "@id": "urn:ex/zone-311-temp"
             },
             {
-                "@id": "urn:ex/zone-111-window-switch-on-off"
+                "@id": "urn:ex/zone-311-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil-valve-command",
+        "@id": "urn:ex/office-ahu-sa-fan-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/office-ahu-sa-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-517-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-510-air-in"
+                "@id": "urn:ex/vav-517-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-510-discharge-air-flow"
+                "@id": "urn:ex/vav-517-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-203-cooling-setpoint",
+        "@id": "urn:ex/vav-509-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-hot-water-in",
+        "@id": "urn:ex/zone-203-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-517-hot-water-in-connection"
+                "@id": "urn:ex/room-203-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-203-temp"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-503-hot-water-in-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -14671,29 +14485,29 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-538-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-516-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-516-hot-water-in-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-hot-water-out",
+        "@id": "urn:ex/vav-530-reheat-coil-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-520-hot-water-out-connection"
+                "@id": "urn:ex/vav-530-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -14703,32 +14517,42 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-533-damper",
+        "@id": "urn:ex/vav-533-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-533-damper-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-533-damper-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-533-damper-command"
-            },
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-539-duct-after-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-533-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-103-cooling-setpoint",
+        "@id": "urn:ex/vav-502-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -14742,94 +14566,93 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-533-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-101-building-static-pressure",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-101-hvac-domain",
+        "@id": "urn:ex/vav-506-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-101-in"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/room-101-out"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-105-window-switch-on-off",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil-water-out",
+        "@id": "urn:ex/vav-536-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-531-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-536-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-air-out",
+        "@id": "urn:ex/vav-512-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-204-205"
+                "@id": "urn:ex/vav-512-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-521-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-521-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-521-discharge-air-temp"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-521-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-512-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-damper-out",
+        "@id": "urn:ex/vav-531-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-535-duct-after-damper"
+                "@id": "urn:ex/connection-to-room-307-308"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -14839,127 +14662,185 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-535-colder-supply-air-requests"
+                "@id": "urn:ex/vav-531-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-535-cooling-pid-output"
+                "@id": "urn:ex/vav-531-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-531-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-air-in",
+        "@id": "urn:ex/room-312-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/room-312-in"
+            },
+            {
+                "@id": "urn:ex/room-312-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-temp-sensor",
+        "@id": "urn:ex/vav-526-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/office-ahu-sa-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-537-more-heat-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/office-ahu-sa-temp"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-heating-pid-output",
+        "@id": "urn:ex/zone-109-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil",
+        "@id": "urn:ex/zone-104-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-514-reheat-coil-air-in"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-211",
+        "@type": [
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:ex/room-211-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/zone-211-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-514-reheat-coil-air-out"
+                "@id": "urn:ex/zone-211-heating-setpoint"
             },
             {
-                "@id": "urn:ex/vav-514-reheat-coil-water-in"
+                "@id": "urn:ex/zone-211-occupancy"
             },
             {
-                "@id": "urn:ex/vav-514-reheat-coil-water-out"
+                "@id": "urn:ex/zone-211-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-211-temp"
+            },
+            {
+                "@id": "urn:ex/zone-211-window-switch-on-off"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-526-reheat-coil-water-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/vav-526-hot-water-in-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-526-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-heating-pid-output",
+        "@id": "urn:ex/vav-525-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-reheat-coil-air-in",
+        "@id": "urn:ex/vav-507-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-535-duct-after-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-air-out",
+        "@id": "urn:ex/vav-508-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-307-308"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -14967,96 +14848,58 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-531-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-531-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-531-discharge-air-temp"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-531-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-508-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206",
+        "@id": "urn:ex/",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/room-206-hvac-domain"
-            }
+            "http://www.w3.org/2002/07/owl#Ontology"
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-532-reheat-coil-valve-position",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-206-co2-concentration"
-            },
-            {
-                "@id": "urn:ex/zone-206-co2-concentration-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-206-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-206-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-206-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-206-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-206-temp"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-206-window-switch-on-off"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-damper-out",
+        "@id": "urn:ex/office-ahu-ea-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-536-duct-after-damper"
+                "@id": "urn:ex/office-ahu-duct-after-ra-fan"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-536-colder-supply-air-requests"
-            },
-            {
-                "@id": "urn:ex/vav-536-cooling-pid-output"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-air-in",
+        "@id": "urn:ex/room-117-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/connection-to-room-116-117"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -15066,53 +14909,56 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-502-air-out",
+        "@id": "urn:ex/vav-504-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/connection-to-room-101"
+                "@id": "urn:ex/vav-504-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-504-discharge-air-temp"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-522-colder-supply-air-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-502-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-502-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-502-discharge-air-temp"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-502-discharge-air-temp-setpoint"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-damper-actuator",
+        "@id": "urn:ex/zone-208-209-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-536-damper"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-519-colder-supply-air-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-536-damper-command"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-damper-in",
+        "@id": "urn:ex/vav-526-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -15128,317 +14974,367 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-506-air-in"
+                "@id": "urn:ex/vav-526-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-313",
+        "@id": "urn:ex/vav-524-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-212-cooling-setpoint",
+        "@id": "urn:ex/zone-211-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/room-211-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/zone-211-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-reheat-coil-air-out",
+        "@id": "urn:ex/vav-540-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-111"
+                "@id": "urn:ex/vav-540-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-510-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-510-more-heat-requests"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-510-air-out"
+                "@id": "urn:ex/vav-540-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil-air-in",
+        "@id": "urn:ex/vav-501-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-503-duct-after-damper"
+                "@id": "urn:ex/vav-501-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-damper-actuator",
+        "@id": "urn:ex/vav-532-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-506-damper"
+                "@id": "urn:ex/vav-532-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-506-damper-command"
+                "@id": "urn:ex/vav-532-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-damper-out",
+        "@id": "urn:ex/vav-521-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-540-duct-after-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-508-heating-pid-output",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-540-colder-supply-air-requests"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-540-cooling-pid-output"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-525-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-504-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-504-reheat-coil-valve-command"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-damper-in",
+        "@id": "urn:ex/zone-103",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/room-103-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-524-air-in"
+                "@id": "urn:ex/zone-103-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-103-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-103-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-103-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-103-temp"
+            },
+            {
+                "@id": "urn:ex/zone-103-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-more-heat-requests",
+        "@id": "urn:ex/vav-519-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil-water-out",
+        "@id": "urn:ex/vav-539-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-503-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-539-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-539-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-539-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-539-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-damper",
+        "@id": "urn:ex/office-ahu-oa-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Damper",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-504-damper-in"
+                "@id": "urn:ex/office-ahu-oa-damper-in"
             },
             {
-                "@id": "urn:ex/vav-504-damper-out"
+                "@id": "urn:ex/office-ahu-oa-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-504-damper-command"
+                "@id": "urn:ex/office-ahu-oa-damper-command"
             },
             {
-                "@id": "urn:ex/vav-504-damper-position"
+                "@id": "urn:ex/office-ahu-oa-damper-position"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Economizer"
+            },
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Outside"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-duct-after-damper",
+        "@id": "urn:ex/vav-517-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-clg-coil",
+        "@id": "urn:ex/vav-505-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#ChilledWaterCoil"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-clg-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/office-ahu-clg-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/office-ahu-clg-coil-water-in"
-            },
-            {
-                "@id": "urn:ex/office-ahu-clg-coil-water-out"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-527-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/vav-508-air-out"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-508-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-reheat-coil-air-in",
+        "@id": "urn:ex/vav-514-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-509-duct-after-damper"
+                "@id": "urn:ex/connection-to-room-115"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-514-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-514-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-514-air-out"
+            }
         ]
     },
     {
-        "@id": "urn:ex/room-104-hvac-domain",
+        "@id": "urn:ex/vav-510-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/room-104-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-104-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-102-in",
+        "@id": "urn:ex/vav-525-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/connection-to-room-102"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-302-occupancy",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-hot-water-out-connection",
+        "@id": "urn:ex/vav-527-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -15450,151 +15346,121 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-504-reheat-coil-air-out",
+        "@id": "urn:ex/vav-533-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-105"
+                "@id": "urn:ex/vav-533-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-504-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-504-more-heat-requests"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-504-air-out"
+                "@id": "urn:ex/vav-533-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-damper-in",
+        "@id": "urn:ex/vav-529-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-508-air-in"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-201-in",
+        "@id": "urn:ex/vav-501-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/connection-to-room-201"
+                "@id": "urn:ex/vav-501-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-501-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-valve",
+        "@id": "urn:ex/vav-530-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-506-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-506-reheat-coil-valve-out"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/connection-to-room-309-310",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-506-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-506-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-damper-in",
+        "@id": "urn:ex/vav-501-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-501-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-519-air-in"
+                "@id": "urn:ex/vav-501-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil-air-out",
+        "@id": "urn:ex/vav-528-reheat-coil-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-116-117"
+                "@id": "urn:ex/vav-528-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-515-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-515-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-515-air-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-damper-command",
+        "@id": "urn:ex/office-ahu-ra-fan-speed-cmd",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -15610,115 +15476,122 @@
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-106-107",
+        "@id": "urn:ex/vav-526-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/connection-to-room-212"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-539-reheat-coil-valve-position",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-526-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-526-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-526-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-526-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-discharge-air-temp",
+        "@id": "urn:ex/vav-512-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-527-hot-water-out-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-501-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-530-air-out"
+                "@id": "urn:ex/vav-501-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-530-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-306",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/room-306-hvac-domain"
+                "@id": "urn:ex/vav-501-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-damper-actuator",
+        "@id": "urn:ex/vav-501-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-533-damper"
+                "@id": "urn:ex/vav-501-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-533-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-hot-water-in",
+        "@id": "urn:ex/vav-514-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-531-hot-water-in-connection"
+                "@id": "urn:ex/vav-514-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-514-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-514-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-101-temp",
+        "@id": "urn:ex/zone-106-107-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -15734,34 +15607,43 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-538-discharge-air-temp",
+        "@id": "urn:ex/room-215-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/room-215-in"
+            },
+            {
+                "@id": "urn:ex/room-215-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-305-window-switch-on-off",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-hot-water-in",
+        "@id": "urn:ex/vav-510-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-536-hot-water-in-connection"
+                "@id": "urn:ex/vav-510-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -15771,217 +15653,207 @@
         ]
     },
     {
-        "@id": "urn:ex/room-210-out",
+        "@id": "urn:ex/vav-502-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-521-hot-water-out-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-116-117",
+        "@id": "urn:ex/vav-518-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-116-hvac-domain"
+                "@id": "urn:ex/vav-518-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/room-117-hvac-domain"
+                "@id": "urn:ex/vav-518-reheat-coil-valve-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-116-117-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-116-117-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-116-117-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-116-117-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-116-117-temp"
+                "@id": "urn:ex/vav-518-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/zone-116-117-window-switch-on-off"
+                "@id": "urn:ex/vav-518-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-215-occupancy-sensor",
+        "@id": "urn:ex/vav-518-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-215-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-215-occupancy"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-colder-supply-air-requests",
+        "@id": "urn:ex/vav-515-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-damper-in",
+        "@id": "urn:ex/vav-505-hot-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-505-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-530-air-in"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-504-colder-supply-air-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-damper-position",
+        "@id": "urn:ex/vav-502-cooling-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-valve-actuator",
+        "@id": "urn:ex/room-203-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-532-reheat-coil-valve"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-532-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-212-hvac-domain",
+        "@id": "urn:ex/vav-511",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-212-in"
+                "@id": "urn:ex/vav-511-air-in"
             },
             {
-                "@id": "urn:ex/room-212-out"
+                "@id": "urn:ex/vav-511-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-511-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-511-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-511-damper"
+            },
+            {
+                "@id": "urn:ex/vav-511-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-511-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil-valve-command",
+        "@id": "urn:ex/office-ahu-ra-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-214-cooling-setpoint",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/office-ahu-ra-flow"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/office-ahu-ra-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-115",
+        "@id": "urn:ex/zone-116-117-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/room-116-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-116-117-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-209-out",
+        "@id": "urn:ex/room-211-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -15997,176 +15869,148 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-fan-power",
+        "@id": "urn:ex/vav-509-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/W"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-damper-actuator",
+        "@id": "urn:ex/vav-535-reheat-coil-valve-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-520-damper"
+                "@id": "urn:ex/vav-535-reheat-coil-valve"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-520-damper-command"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-307-hvac-domain",
-        "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-307-in"
-            },
-            {
-                "@id": "urn:ex/room-307-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-535-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-more-heat-requests",
+        "@id": "urn:ex/vav-521-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-more-heat-requests",
+        "@id": "urn:ex/vav-512-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-hot-water-out",
+        "@id": "urn:ex/vav-506-reheat-coil-valve-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-532-hot-water-out-connection"
+                "@id": "urn:ex/vav-506-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-506-hot-water-out"
+            }
         ]
     },
     {
-        "@id": "urn:ex/zone-204-205-cooling-setpoint",
+        "@id": "urn:ex/room-211-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/connection-to-room-211"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-305-heating-setpoint",
+        "@id": "urn:ex/vav-508-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-508-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-508-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-in",
+        "@id": "urn:ex/vav-517-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-oa-in-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513",
+        "@id": "urn:ex/vav-513-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-513-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-513-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-513-hot-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-513-hot-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-513-damper"
-            },
-            {
-                "@id": "urn:ex/vav-513-reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-513-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-hot-water-out-connection",
+        "@id": "urn:ex/vav-511-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -16178,90 +16022,84 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-501-hot-water-in",
+        "@id": "urn:ex/room-206-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-501-hot-water-in-connection"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-discharge-air-flow",
+        "@id": "urn:ex/vav-525-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/vav-525-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-308",
+        "@id": "urn:ex/zone-211-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-308-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-valve",
+        "@id": "urn:ex/vav-529-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-540-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-540-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-529-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-540-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-540-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-529-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-air-in",
+        "@id": "urn:ex/connection-to-room-108",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -16270,58 +16108,23 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-air-in",
+        "@id": "urn:ex/zone-102-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-540-duct-after-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-525-hot-water-out-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-215-window-switch-on-off",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "urn:ex/room-102-hvac-domain"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-540-hot-water-in-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/zone-102-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-518-reheat-coil-valve-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -16337,22 +16140,14 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-522-duct-after-damper",
+        "@id": "urn:ex/vav-540-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-540-hot-water-out-connection"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-522-pipe-hot-water-return-before-valve",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -16361,258 +16156,186 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-112-114",
+        "@id": "urn:ex/vav-506-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/room-112-hvac-domain"
-            },
-            {
-                "@id": "urn:ex/room-114-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-506-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-112-114-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-112-114-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-112-114-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-112-114-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-112-114-temp"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-112-114-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-304",
+        "@id": "urn:ex/vav-531-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/room-304-hvac-domain"
+                "@id": "urn:ex/vav-531-reheat-coil-valve"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-202-occupancy",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "urn:ex/vav-531-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-hot-water-in-connection",
+        "@id": "urn:ex/vav-528-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-303-304-306-occupancy-override",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ea-out-connection",
+        "@id": "urn:ex/office-ahu-chilled-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/office-ahu-chilled-water-out-connection"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-524-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-519-duct-after-damper",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-damper",
+        "@id": "urn:ex/vav-504-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-514-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-514-damper-out"
+                "@id": "urn:ex/vav-504-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-514-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-514-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-cooling-pid-output",
+        "@id": "urn:ex/vav-533-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-533-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-discharge-air-flow",
+        "@id": "urn:ex/vav-511-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-118-occupancy",
+        "@id": "urn:ex/zone-116-117-window-switch-on-off",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ea-damper-in",
+        "@id": "urn:ex/vav-540-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-duct-after-ra-fan"
+                "@id": "urn:ex/connection-to-room-215"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-521-pipe-hot-water-return-before-valve",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-116-117-cooling-setpoint",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/vav-540-heating-pid-output"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-540-more-heat-requests"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-540-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-more-heat-requests",
+        "@id": "urn:ex/zone-106-107-occupancy-override",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-heating-pid-output",
+        "@id": "urn:ex/vav-535-cooling-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -16628,46 +16351,35 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-516-cooling-pid-output",
+        "@id": "urn:ex/vav-516-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/vav-516-reheat-coil-air-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-ma-temp-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+                "@id": "urn:ex/vav-516-reheat-coil-air-out"
+            },
             {
-                "@id": "urn:ex/office-ahu-air-filter-in"
+                "@id": "urn:ex/vav-516-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-516-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/office-ahu-ma-temp"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-discharge-air-temp",
+        "@id": "urn:ex/vav-512-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -16681,89 +16393,82 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-313-temp-sensor",
+        "@id": "urn:ex/vav-529-discharge-air-flow-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-313-hvac-domain"
+                "@id": "urn:ex/vav-529-air-in"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-313-temp"
+                "@id": "urn:ex/vav-529-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-discharge-air-temp",
+        "@id": "urn:ex/vav-519-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-519-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-damper",
+        "@id": "urn:ex/vav-518-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-512-damper-in"
-            },
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-512-damper-out"
+                "@id": "urn:ex/vav-518-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-512-damper-command"
-            },
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-512-damper-position"
+                "@id": "urn:ex/vav-518-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-cooling-pid-output",
+        "@id": "urn:ex/vav-504-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-504-hot-water-in-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-504-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-301-in",
+        "@id": "urn:ex/room-105-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-301"
+                "@id": "urn:ex/connection-to-room-105"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -16773,193 +16478,201 @@
         ]
     },
     {
-        "@id": "urn:ex/room-114-in",
+        "@id": "urn:ex/vav-512-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/connection-to-room-112-114"
+                "@id": "urn:ex/vav-512-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-512-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-damper-in",
+        "@id": "urn:ex/office-ahu-oa-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-504-air-in"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-311-window-switch-on-off",
+        "@id": "urn:ex/vav-503-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-discharge-air-flow-setpoint",
+        "@id": "urn:ex/zone-113-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/room-113-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/zone-113-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-210-heating-setpoint",
+        "@id": "urn:ex/vav-507-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-111-temp-sensor",
+        "@id": "urn:ex/connection-to-room-302",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-111-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-109-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-111-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-discharge-air-temp",
+        "@id": "urn:ex/vav-528-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/vav-528-reheat-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-528-reheat-coil-valve-command"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-525-damper-command",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-113-window-switch-on-off",
+        "@id": "urn:ex/zone-311-occupancy-override",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-cooling-pid-output",
+        "@id": "urn:ex/vav-518-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-506-damper-position",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-506-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-528-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil-valve",
+        "@id": "urn:ex/vav-510-reheat-coil-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Valve",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-534-reheat-coil-valve-in"
+                "@id": "urn:ex/vav-510-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/vav-534-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-510-reheat-coil-valve-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -16969,98 +16682,68 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-534-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-510-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-534-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-510-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-reheat-coil-valve-out",
+        "@id": "urn:ex/room-201-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-518-hot-water-out-connection"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-518-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-air-out",
+        "@id": "urn:ex/vav-524-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/connection-to-room-210"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-524-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-524-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-524-discharge-air-temp"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-524-discharge-air-temp-setpoint"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-damper-in",
+        "@id": "urn:ex/vav-508-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-514-air-in"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-311-occupancy-override",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-hot-water-out-connection",
+        "@id": "urn:ex/vav-531-hot-water-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -17072,163 +16755,162 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-518-hot-water-in-connection",
+        "@id": "urn:ex/connection-to-room-101",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-reheat-coil-air-in",
+        "@id": "urn:ex/vav-511-hot-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-502-duct-after-damper"
+                "@id": "urn:ex/vav-511-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-more-heat-requests",
+        "@id": "urn:ex/room-101-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/room-101-in"
+            },
+            {
+                "@id": "urn:ex/room-101-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-air-in",
+        "@id": "urn:ex/vav-502-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-526-duct-after-damper"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-damper-in",
+        "@id": "urn:ex/vav-518-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-518-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-507-air-in"
+                "@id": "urn:ex/vav-518-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-reheat-coil",
+        "@id": "urn:ex/vav-510-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-510-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-510-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-510-reheat-coil-water-in"
-            },
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-510-reheat-coil-water-out"
+                "@id": "urn:ex/vav-510-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/vav-510-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-reheat-coil-valve-out",
+        "@id": "urn:ex/office-ahu-oa-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-504-hot-water-out-connection"
+                "@id": "http://data.ashrae.org/standard223#Role-Outside"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-504-hot-water-out"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-105-cooling-setpoint",
+        "@id": "urn:ex/vav-536-discharge-air-flow-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-112-114-occupancy-override",
+        "@id": "urn:ex/vav-503-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:ex/vav-503-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-503-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-air-out",
+        "@id": "urn:ex/vav-536-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-314"
+                "@id": "urn:ex/connection-to-room-313"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -17238,93 +16920,82 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-534-discharge-air-flow"
+                "@id": "urn:ex/vav-536-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-534-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-536-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/vav-534-discharge-air-temp"
+                "@id": "urn:ex/vav-536-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/vav-534-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-536-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-reheat-coil-air-out",
+        "@id": "urn:ex/vav-518-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-214"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-539-heating-pid-output"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-539-more-heat-requests"
+                "@id": "urn:ex/vav-518-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-539-air-out"
+                "@id": "urn:ex/vav-518-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-damper-in",
+        "@id": "urn:ex/vav-508-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-508-damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-508-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-540-air-in"
+                "@id": "urn:ex/vav-508-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-508-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-109-heating-setpoint",
+        "@id": "urn:ex/vav-517-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-517-air-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-517-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-hot-water-in",
+        "@id": "urn:ex/vav-515-hot-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-525-hot-water-in-connection"
+                "@id": "urn:ex/vav-515-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -17334,114 +17005,85 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-528-hot-water-out",
+        "@id": "urn:ex/vav-529-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-528-hot-water-out-connection"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-524-reheat-coil-air-in",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-524-duct-after-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-damper",
+        "@id": "urn:ex/vav-519-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Damper",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-517-damper-in"
+                "@id": "urn:ex/vav-519-damper-in"
             },
             {
-                "@id": "urn:ex/vav-517-damper-out"
+                "@id": "urn:ex/vav-519-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-517-damper-command"
+                "@id": "urn:ex/vav-519-damper-command"
             },
             {
-                "@id": "urn:ex/vav-517-damper-position"
+                "@id": "urn:ex/vav-519-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-air-out",
+        "@id": "urn:ex/vav-527-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-303-304-306"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-529-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-529-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-529-discharge-air-temp"
-            },
-            {
-                "@id": "urn:ex/vav-529-discharge-air-temp-setpoint"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-hot-water-in",
+        "@id": "urn:ex/vav-514-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-515-hot-water-in-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-air-out",
+        "@id": "urn:ex/vav-501-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-215"
+                "@id": "urn:ex/connection-to-room-102"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -17451,64 +17093,48 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-540-heating-pid-output"
+                "@id": "urn:ex/vav-501-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-540-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+                "@id": "urn:ex/vav-501-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "urn:ex/vav-540-air-out"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/connection-to-room-206",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-501-discharge-air-temp"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-501-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-damper-actuator",
+        "@id": "urn:ex/zone-312-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/office-ahu-ra-damper"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/office-ahu-ra-damper-command"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-307-308-occupancy-sensor",
+        "@id": "urn:ex/vav-537-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-307-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-307-308-occupancy"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-damper-in",
+        "@id": "urn:ex/vav-504-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -17524,49 +17150,30 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-529-air-in"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-ra-temp-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/office-ahu-ra-in"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:ex/office-ahu-ra-temp"
+                "@id": "urn:ex/vav-504-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-209-hvac-domain",
+        "@id": "urn:ex/zone-106-107-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-209-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-209-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-211-heating-setpoint",
+        "@id": "urn:ex/zone-204-205-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -17580,177 +17187,186 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-flow-sensor",
+        "@id": "urn:ex/vav-504-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-sa-fan-in"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/office-ahu-sa-flow"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-damper-actuator",
+        "@id": "urn:ex/vav-530-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-521-damper"
+                "@id": "urn:ex/vav-530-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-530-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-530-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-530-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-521-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-531-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-516-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-531-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-108-occupancy",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-512-hot-water-out-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-531-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-501-cooling-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-valve",
+        "@id": "urn:ex/zone-302-co2-concentration-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-528-reheat-coil-valve-in"
-            },
+        "http://data.ashrae.org/standard223#ofSubstance": [
             {
-                "@id": "urn:ex/vav-528-reheat-coil-valve-out"
+                "@id": "http://data.ashrae.org/standard223#Substance-CO2"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://qudt.org/vocab/quantitykind/MoleFraction"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-528-reheat-coil-valve-command"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-528-reheat-coil-valve-position"
+                "@id": "http://qudt.org/vocab/unit/PPM"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-504-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-515-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-504-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-504-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-529",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-517-reheat-coil-valve"
+                "@id": "urn:ex/vav-529-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-529-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-529-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-529-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-517-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-529-damper"
+            },
+            {
+                "@id": "urn:ex/vav-529-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-529-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-302-temp",
+        "@id": "urn:ex/vav-524-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/connection-to-room-210"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-524-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-524-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-524-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-discharge-air-temp",
+        "@id": "urn:ex/zone-118-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -17764,43 +17380,47 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-539-air-out",
+        "@id": "urn:ex/zone-115-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/connection-to-room-214"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-510-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-510-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-510-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-539-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-539-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-539-discharge-air-temp"
+                "@id": "urn:ex/vav-510-damper-command"
             },
             {
-                "@id": "urn:ex/vav-539-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-510-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-reheat-coil-water-out",
+        "@id": "urn:ex/office-ahu-htg-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-522-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/office-ahu-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -17810,161 +17430,146 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-513-damper-command",
+        "@id": "urn:ex/vav-536-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-hot-water-in",
+        "@id": "urn:ex/vav-505-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-540-hot-water-in-connection"
+                "@id": "urn:ex/vav-505-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-505-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-505-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-505-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-527-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-530-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-527-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-527-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-discharge-air-temp-setpoint",
+        "@id": "urn:ex/office-ahu-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-fan-speed-status",
+        "@id": "urn:ex/vav-529-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-529-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-529-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-202-temp",
+        "@id": "urn:ex/zone-101-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-duct-after-damper",
+        "@id": "urn:ex/vav-504-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil-air-out",
+        "@id": "urn:ex/vav-525-reheat-coil-valve-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-301"
+                "@id": "urn:ex/vav-525-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-527-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-527-more-heat-requests"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-527-air-out"
+                "@id": "urn:ex/vav-525-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-101-occupancy",
+        "@id": "urn:ex/zone-102-occupancy-override",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-reheat-coil-air-in",
+        "@id": "urn:ex/vav-512-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-505-duct-after-damper"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -17974,125 +17579,143 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-515-hot-water-out",
+        "@id": "urn:ex/room-301-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-515-hot-water-out-connection"
+                "@id": "urn:ex/connection-to-room-301"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528",
+        "@id": "urn:ex/zone-112-114",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-528-air-in"
+                "@id": "urn:ex/room-112-hvac-domain"
             },
             {
-                "@id": "urn:ex/vav-528-air-out"
+                "@id": "urn:ex/room-114-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/zone-112-114-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-528-hot-water-in"
+                "@id": "urn:ex/zone-112-114-heating-setpoint"
             },
             {
-                "@id": "urn:ex/vav-528-hot-water-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#contains": [
+                "@id": "urn:ex/zone-112-114-occupancy"
+            },
             {
-                "@id": "urn:ex/vav-528-damper"
+                "@id": "urn:ex/zone-112-114-occupancy-override"
             },
             {
-                "@id": "urn:ex/vav-528-reheat-coil"
+                "@id": "urn:ex/zone-112-114-temp"
             },
             {
-                "@id": "urn:ex/vav-528-reheat-coil-valve"
+                "@id": "urn:ex/zone-112-114-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-reheat-coil-water-in",
+        "@id": "urn:ex/zone-115-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-519-hot-water-in-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-519-hot-water-in"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-reheat-coil-water-in",
+        "@id": "urn:ex/room-209-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-530-hot-water-in-connection"
+                "@id": "urn:ex/connection-to-room-208-209"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-530-hot-water-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-hot-water-in-connection",
+        "@id": "urn:ex/zone-102",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-102-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/zone-102-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-102-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-102-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-102-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-102-temp"
+            },
+            {
+                "@id": "urn:ex/zone-102-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-115-temp",
+        "@id": "urn:ex/zone-312-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/room-312-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/zone-312-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-214",
+        "@id": "urn:ex/connection-to-room-301",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -18104,39 +17727,29 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-535-reheat-coil",
+        "@id": "urn:ex/office-ahu-ra-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-535-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-535-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-535-reheat-coil-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-535-reheat-coil-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-damper-out",
+        "@id": "urn:ex/vav-518-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-519-duct-after-damper"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -18144,162 +17757,184 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-519-colder-supply-air-requests"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-519-cooling-pid-output"
+                "@id": "urn:ex/vav-518-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-colder-supply-air-requests",
+        "@id": "urn:ex/vav-507-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-507-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-discharge-air-flow",
+        "@id": "urn:ex/vav-532-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-damper-actuator",
+        "@id": "urn:ex/vav-525",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-511-damper"
+                "@id": "urn:ex/vav-525-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-525-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-525-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-525-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-511-damper-command"
+                "@id": "urn:ex/vav-525-damper"
+            },
+            {
+                "@id": "urn:ex/vav-525-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-525-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-damper-in",
+        "@id": "urn:ex/room-103-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/room-103-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/room-103-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-523-air-in"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-115-occupancy",
+        "@id": "urn:ex/vav-514-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "urn:ex/vav-514-air-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-207-occupancy-override",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:ex/vav-514-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-539-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-539-duct-after-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-hot-water-out",
+        "@id": "urn:ex/room-115-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-511-hot-water-out-connection"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-208-209-occupancy-override",
+        "@id": "urn:ex/room-106",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:ex/room-106-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-211-occupancy-override",
+        "@id": "urn:ex/vav-501-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:ex/vav-501-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-501-damper-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-501-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-501-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-hot-water-out-connection",
+        "@id": "urn:ex/vav-528-hot-water-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -18311,85 +17946,105 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-519-reheat-coil-air-in",
+        "@id": "urn:ex/vav-529-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-519-duct-after-damper"
+                "@id": "urn:ex/vav-529-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-hot-water-out-connection",
+        "@id": "urn:ex/vav-522-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/connection-to-room-208-209"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-207-window-switch-on-off",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "urn:ex/vav-522-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-522-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-522-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-522-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-damper-in",
+        "@id": "urn:ex/vav-525-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-525-reheat-coil-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-525-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-525-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-525-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-526-air-in"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-113-occupancy-sensor",
+        "@id": "urn:ex/vav-505-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-113-hvac-domain"
+                "@id": "urn:ex/vav-505-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-113-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-505-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-505-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-210-temp",
+        "@id": "urn:ex/zone-305-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -18403,179 +18058,168 @@
         ]
     },
     {
-        "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override",
+        "@id": "urn:ex/vav-501-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumerationKind"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-discharge-air-flow",
+        "@id": "urn:ex/zone-206-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-air-out",
+        "@id": "urn:ex/room-212-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-113"
+                "@id": "urn:ex/room-212-in"
+            },
+            {
+                "@id": "urn:ex/room-212-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-503-reheat-coil",
+        "@type": [
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-509-discharge-air-flow"
+                "@id": "urn:ex/vav-503-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-509-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-503-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-509-discharge-air-temp"
+                "@id": "urn:ex/vav-503-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-509-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-503-reheat-coil-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-cooling-pid-output",
+        "@id": "urn:ex/vav-518-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-207",
+        "@id": "urn:ex/room-215",
         "@type": [
             "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
         "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/room-207-hvac-domain"
+                "@id": "urn:ex/room-215-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-reheat-coil-valve",
+        "@id": "urn:ex/vav-531-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-513-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-513-reheat-coil-valve-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-513-reheat-coil-valve-command"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-513-reheat-coil-valve-position"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-314-occupancy",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-203-occupancy-override",
+        "@id": "urn:ex/vav-521-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil-water-out",
+        "@id": "urn:ex/vav-536-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-527-pipe-hot-water-return-before-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-104-out",
+        "@id": "urn:ex/vav-523-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-523-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil-air-in",
+        "@id": "urn:ex/vav-507-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-536-duct-after-damper"
+                "@id": "urn:ex/vav-507-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -18585,223 +18229,108 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-501-damper-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-501-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
-            {
-                "@id": "urn:ex/vav-501-damper-command"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-210",
+        "@id": "urn:ex/vav-534-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/room-210-hvac-domain"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-210-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-210-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-210-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-210-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-210-temp"
-            },
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/zone-210-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-531-heating-pid-output",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil",
+        "@id": "urn:ex/vav-521-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-526-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-526-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-526-reheat-coil-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-526-reheat-coil-water-out"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-118",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/room-118-hvac-domain"
+                "@id": "urn:ex/vav-521-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil",
+        "@id": "urn:ex/zone-103-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-503-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-503-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-503-reheat-coil-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-503-reheat-coil-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-106-107",
+        "@id": "urn:ex/vav-524-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/room-106-hvac-domain"
-            },
-            {
-                "@id": "urn:ex/room-107-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-524-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-106-107-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-106-107-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-106-107-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-106-107-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-106-107-temp"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-106-107-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil-valve",
+        "@id": "urn:ex/room-313",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-520-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-520-reheat-coil-valve-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-520-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-520-reheat-coil-valve-position"
+                "@id": "urn:ex/room-313-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-520-discharge-air-temp-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-hot-water-out-connection",
+        "@id": "urn:ex/vav-525-hot-water-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -18813,78 +18342,85 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-clg-coil-water-in",
+        "@id": "urn:ex/vav-521-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/office-ahu-chilled-water-in-connection"
+                "@id": "urn:ex/vav-521-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-521-damper-command"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-528-discharge-air-flow-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/office-ahu-colder-chilled-water-requests"
+                "@id": "urn:ex/vav-528-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/office-ahu-chilled-water-in"
+                "@id": "urn:ex/vav-528-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-508-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil-water-out",
+        "@id": "urn:ex/vav-535-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-515-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-535-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-535-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-303",
+        "@id": "urn:ex/vav-524-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-303-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-damper-position",
+        "@id": "urn:ex/vav-534-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -18898,7 +18434,7 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-532-colder-supply-air-requests",
+        "@id": "urn:ex/vav-530-more-heat-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -18909,105 +18445,112 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-539-more-heat-requests",
+        "@id": "urn:ex/vav-532-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/connection-to-room-309-310"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-512-discharge-air-temp-setpoint",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-532-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-532-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-532-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-heating-pid-output",
+        "@id": "urn:ex/vav-525-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-204-205",
+        "@id": "urn:ex/zone-203",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/room-203-hvac-domain"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-306-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/zone-203-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-203-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-203-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-203-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-203-temp"
+            },
+            {
+                "@id": "urn:ex/zone-203-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-discharge-air-flow",
+        "@id": "urn:ex/office-ahu-duct-after-htg-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-303-in",
+        "@id": "urn:ex/vav-515-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-303-304-306"
+                "@id": "urn:ex/vav-515-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -19017,73 +18560,82 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-307-308-temp-sensor",
+        "@id": "urn:ex/vav-506-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-307-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-307-308-temp"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil-water-out",
+        "@id": "urn:ex/vav-532-reheat-coil-valve-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-516-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-532-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-532-hot-water-out"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-duct-after-damper",
+        "@id": "urn:ex/vav-533-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-210-cooling-setpoint",
+        "@id": "urn:ex/room-117-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-damper-out",
+        "@id": "urn:ex/vav-521-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-516-duct-after-damper"
+                "@id": "urn:ex/vav-521-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -19093,109 +18645,97 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-516-colder-supply-air-requests"
+                "@id": "urn:ex/vav-521-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-516-cooling-pid-output"
+                "@id": "urn:ex/vav-521-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-512-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-528-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-528-reheat-coil-valve-command"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-air-in",
+        "@id": "urn:ex/vav-509-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-reheat-coil-valve",
+        "@id": "urn:ex/vav-514-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-519-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-519-reheat-coil-valve-out"
-            }
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "urn:ex/vav-514-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-519-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-519-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-514-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-duct-after-damper",
+        "@id": "urn:ex/vav-528-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-clg-coil-air-out",
+        "@id": "urn:ex/vav-518-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-duct-after-clg-coil"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-air-out",
+        "@id": "urn:ex/vav-536-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-112-114"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -19203,130 +18743,160 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-511-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-511-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-511-discharge-air-temp"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-511-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-536-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-505-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-discharge-air-temp-sensor",
+        "@id": "urn:ex/zone-303-304-306-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/vav-509-air-out"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-509-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-water-in",
+        "@id": "urn:ex/vav-539-reheat-coil-valve-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-529-hot-water-in-connection"
+                "@id": "urn:ex/vav-539-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-535",
+        "@type": [
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-529-hot-water-in"
+                "@id": "urn:ex/vav-535-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-535-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-535-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-535-hot-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:ex/vav-535-damper"
+            },
+            {
+                "@id": "urn:ex/vav-535-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-535-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-115-out",
+        "@id": "urn:ex/vav-533-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-536-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/connection-to-room-313"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-536-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-536-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-536-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-damper-command",
+        "@id": "urn:ex/zone-214-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil-valve",
+        "@id": "urn:ex/vav-526-reheat-coil-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Valve",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-503-reheat-coil-valve-in"
+                "@id": "urn:ex/vav-526-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/vav-503-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-526-reheat-coil-valve-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -19336,31 +18906,42 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-503-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-526-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-503-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-526-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil",
+        "@id": "urn:ex/vav-512-colder-supply-air-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-506-reheat-coil",
         "@type": [
             "http://data.ashrae.org/standard223#HeatingCoil",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-533-reheat-coil-air-in"
+                "@id": "urn:ex/vav-506-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-533-reheat-coil-air-out"
+                "@id": "urn:ex/vav-506-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-533-reheat-coil-water-in"
+                "@id": "urn:ex/vav-506-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-533-reheat-coil-water-out"
+                "@id": "urn:ex/vav-506-reheat-coil-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasRole": [
@@ -19370,286 +18951,271 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-203-occupancy-sensor",
+        "@id": "urn:ex/zone-307-308",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/room-203-hvac-domain"
+                "@id": "urn:ex/room-307-hvac-domain"
+            },
+            {
+                "@id": "urn:ex/room-308-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/zone-203-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/zone-307-308-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-307-308-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-307-308-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-307-308-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-307-308-temp"
+            },
+            {
+                "@id": "urn:ex/zone-307-308-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-307-308-temp",
+        "@id": "urn:ex/vav-511-cooling-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-water-out",
+        "@id": "urn:ex/room-101-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-528-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/connection-to-room-101"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-reheat-coil-water-out",
+        "@id": "urn:ex/vav-509-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-535-pipe-hot-water-return-before-valve"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-524",
-        "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-524-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-524-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-524-hot-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-524-hot-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-524-damper"
-            },
-            {
-                "@id": "urn:ex/vav-524-reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-524-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/zone-109-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-discharge-air-temp-sensor",
+        "@id": "urn:ex/zone-111-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-540-air-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-540-discharge-air-temp"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-damper",
+        "@id": "urn:ex/vav-508",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-536-damper-in"
+                "@id": "urn:ex/vav-508-air-in"
             },
             {
-                "@id": "urn:ex/vav-536-damper-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:ex/vav-508-air-out"
+            },
             {
-                "@id": "urn:ex/vav-536-damper-command"
+                "@id": "urn:ex/vav-508-hot-water-in"
             },
             {
-                "@id": "urn:ex/vav-536-damper-position"
+                "@id": "urn:ex/vav-508-hot-water-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-534-damper",
-        "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-534-damper-in"
+                "@id": "urn:ex/vav-508-damper"
             },
             {
-                "@id": "urn:ex/vav-534-damper-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-534-damper-command"
+                "@id": "urn:ex/vav-508-reheat-coil"
             },
             {
-                "@id": "urn:ex/vav-534-damper-position"
+                "@id": "urn:ex/vav-508-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-discharge-air-flow",
+        "@id": "urn:ex/room-312-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-534-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-538-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-534-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-116-117-occupancy-sensor",
+        "@id": "urn:ex/vav-521-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-116-hvac-domain"
+                "@id": "urn:ex/vav-521-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-116-117-occupancy"
+                "@id": "urn:ex/vav-521-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/room-202",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-202-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-529-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-511-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-529-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-529-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-529-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-529-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-colder-supply-air-requests",
+        "@id": "urn:ex/zone-311-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/room-311-hvac-domain"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-523-colder-supply-air-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/zone-311-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-air-in",
+        "@id": "urn:ex/room-307-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-506-duct-after-damper"
+                "@id": "urn:ex/connection-to-room-307-308"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -19659,90 +19225,101 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-105-window-switch-on-off",
+        "@id": "urn:ex/vav-520-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "urn:ex/vav-520-pipe-hot-water-return-before-valve"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-203",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-203-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-discharge-air-temp-sensor",
+        "@id": "urn:ex/office-ahu-ra-flow-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-526-air-out"
+                "@id": "urn:ex/office-ahu-ra-in"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-526-discharge-air-temp"
+                "@id": "urn:ex/office-ahu-ra-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-104-temp",
+        "@id": "urn:ex/vav-517-cooling-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-reheat-coil-air-out",
+        "@id": "urn:ex/zone-211-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-527-reheat-coil-valve-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-108"
+                "@id": "urn:ex/vav-527-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-214-hvac-domain",
+        "@type": [
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-505-heating-pid-output"
+                "@id": "urn:ex/room-214-in"
             },
             {
-                "@id": "urn:ex/vav-505-more-heat-requests"
+                "@id": "urn:ex/room-214-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-505-air-out"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-202",
+        "@id": "urn:ex/connection-to-room-206",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -19754,591 +19331,679 @@
         ]
     },
     {
-        "@id": "urn:ex/room-302-hvac-domain",
+        "@id": "urn:ex/vav-526-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-302-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-302-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-506-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-115",
+        "@id": "urn:ex/vav-537-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-115-hvac-domain"
+                "@id": "urn:ex/vav-537-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-537-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-110-window-switch-on-off",
+        "@id": "urn:ex/vav-509-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-reheat-coil-valve-out",
+        "@id": "urn:ex/zone-115",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-538-hot-water-out-connection"
+                "@id": "urn:ex/room-115-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-538-hot-water-out"
+                "@id": "urn:ex/zone-115-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-115-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-115-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-115-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-115-temp"
+            },
+            {
+                "@id": "urn:ex/zone-115-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-314-temp",
+        "@id": "urn:ex/zone-206-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/room-206-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/zone-206-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-damper-position",
+        "@id": "urn:ex/vav-507-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-507-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-507-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil-valve-position",
+        "@id": "urn:ex/zone-102-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-105-temp-sensor",
+        "@id": "urn:ex/vav-507-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-105-hvac-domain"
+                "@id": "urn:ex/vav-507-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-105-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-303-304-306-heating-setpoint",
+        "@id": "urn:ex/vav-526-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-526-air-in"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-513-colder-supply-air-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-526-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-204-205-window-switch-on-off",
+        "@id": "urn:ex/zone-109-occupancy",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-flow",
+        "@id": "urn:ex/vav-505-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Outside"
+                "@id": "urn:ex/vav-505-hot-water-in-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/vav-505-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-309-310-occupancy-sensor",
+        "@id": "urn:ex/vav-519",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-309-hvac-domain"
+                "@id": "urn:ex/vav-519-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-519-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-519-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-519-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/zone-309-310-occupancy"
+                "@id": "urn:ex/vav-519-damper"
+            },
+            {
+                "@id": "urn:ex/vav-519-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-519-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-hot-water-out",
+        "@id": "urn:ex/vav-535-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-503-hot-water-out-connection"
+                "@id": "urn:ex/connection-to-room-311"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-535-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-535-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-535-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-535-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-308-in",
+        "@id": "urn:ex/vav-512-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/connection-to-room-307-308"
+                "@id": "urn:ex/vav-512-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-512-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-101-co2-concentration",
+        "@id": "urn:ex/office-ahu-ma-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#ofSubstance": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Substance-CO2"
-            }
-        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/MoleFraction"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PPM"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-215-in",
+        "@id": "urn:ex/office-ahu-ra-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/connection-to-room-215"
+                "@id": "urn:ex/office-ahu-ra-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/office-ahu-ra-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-108-temp-sensor",
+        "@id": "urn:ex/vav-515-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-108-hvac-domain"
+                "@id": "urn:ex/vav-515-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-108-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-515-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-513-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-532-air-in"
+                "@id": "urn:ex/vav-513-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-513-reheat-coil-valve-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-532-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-513-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-513-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-damper-position",
+        "@id": "urn:ex/zone-314-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-reheat-coil-valve-out",
+        "@id": "urn:ex/office-ahu-ra-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-522-hot-water-out-connection"
+                "@id": "urn:ex/office-ahu-duct-after-ra-fan"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-522-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil",
+        "@id": "urn:ex/vav-513-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-531-reheat-coil-air-in"
+                "@id": "urn:ex/vav-513-damper-in"
             },
             {
-                "@id": "urn:ex/vav-531-reheat-coil-air-out"
-            },
+                "@id": "urn:ex/vav-513-damper-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-531-reheat-coil-water-in"
+                "@id": "urn:ex/vav-513-damper-command"
             },
             {
-                "@id": "urn:ex/vav-531-reheat-coil-water-out"
+                "@id": "urn:ex/vav-513-damper-position"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-207-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-520-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-534-hot-water-out-connection"
+                "@id": "urn:ex/connection-to-room-207"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-520-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-520-more-heat-requests"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-534-hot-water-out"
+                "@id": "urn:ex/vav-520-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-522-duct-after-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-502-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-525-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-502-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-502-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-204-205-occupancy-override",
+        "@id": "urn:ex/vav-538-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:ex/connection-to-room-213"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-507-reheat-coil",
-        "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-507-reheat-coil-air-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-538-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-507-reheat-coil-air-out"
+                "@id": "urn:ex/vav-538-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/vav-507-reheat-coil-water-in"
+                "@id": "urn:ex/vav-538-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/vav-507-reheat-coil-water-out"
+                "@id": "urn:ex/vav-538-discharge-air-temp-setpoint"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-522-discharge-air-flow-setpoint",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-110-occupancy-override",
+        "@id": "urn:ex/vav-528-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:ex/vav-528-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-528-damper-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-528-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-528-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-306-hvac-domain",
+        "@id": "urn:ex/vav-539-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-306-in"
-            },
-            {
-                "@id": "urn:ex/room-306-out"
+                "@id": "urn:ex/vav-539-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516",
+        "@id": "urn:ex/vav-527-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-516-air-in"
+                "@id": "urn:ex/vav-527-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-516-air-out"
+                "@id": "urn:ex/vav-527-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-516-hot-water-in"
+                "@id": "urn:ex/vav-527-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-516-hot-water-out"
+                "@id": "urn:ex/vav-527-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-516-damper"
-            },
-            {
-                "@id": "urn:ex/vav-516-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-516-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-damper-out",
+        "@id": "urn:ex/vav-527-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-528-duct-after-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-302-window-switch-on-off",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-528-colder-supply-air-requests"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-528-cooling-pid-output"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-air-out",
+        "@id": "urn:ex/vav-522-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-309-310"
+                "@id": "urn:ex/vav-522-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-ea-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-532-heating-pid-output"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-532-more-heat-requests"
+                "@id": "urn:ex/office-ahu-ea-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-532-air-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-reheat-coil-air-in",
+        "@id": "urn:ex/room-312-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-530-duct-after-damper"
+                "@id": "urn:ex/connection-to-room-312"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -20348,42 +20013,46 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-fan-out",
+        "@id": "urn:ex/vav-506",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-506-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-506-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-506-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-506-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/office-ahu-sa-out"
+                "@id": "urn:ex/vav-506-damper"
+            },
+            {
+                "@id": "urn:ex/vav-506-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-506-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-211-window-switch-on-off",
+        "@id": "urn:ex/vav-523-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "urn:ex/vav-523-duct-after-damper"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/connection-to-room-102",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -20392,132 +20061,189 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-539-reheat-coil-water-out",
+        "@id": "urn:ex/vav-509-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-539-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-air-in",
+        "@id": "urn:ex/office-ahu-htg-coil-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-528-duct-after-damper"
+                "@id": "urn:ex/office-ahu-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/office-ahu-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-discharge-air-temp-sensor",
+        "@id": "urn:ex/office-ahu-htg-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-533-air-out"
+                "@id": "urn:ex/office-ahu-htg-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-htg-coil-valve-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-533-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/office-ahu-htg-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/office-ahu-htg-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-215-occupancy-override",
+        "@id": "urn:ex/vav-507-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-damper-position",
+        "@id": "urn:ex/vav-513-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil",
+        "@id": "urn:ex/vav-506-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-524-reheat-coil-air-in"
-            },
+                "@id": "urn:ex/vav-506-hot-water-in-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-524-reheat-coil-air-out"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-524-reheat-coil-water-in"
-            },
+                "@id": "urn:ex/vav-506-hot-water-in"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-524-damper-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
+        ],
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-524-reheat-coil-water-out"
+                "@id": "urn:ex/vav-524-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/vav-524-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-damper-out",
+        "@id": "urn:ex/zone-106-107-occupancy",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-515-hot-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-502-duct-after-damper"
+                "@id": "urn:ex/vav-515-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-509-reheat-coil-water-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-502-colder-supply-air-requests"
-            },
+                "@id": "urn:ex/vav-509-pipe-hot-water-return-before-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-502-cooling-pid-output"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-hot-water-in-connection",
+        "@id": "urn:ex/vav-540-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -20529,64 +20255,76 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-515-duct-after-damper",
+        "@id": "urn:ex/vav-502-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-502-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-502-reheat-coil-valve-out"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-502-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-502-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-damper-actuator",
+        "@id": "urn:ex/vav-537-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-522-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-522-damper-command"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-214-occupancy-override",
+        "@id": "urn:ex/zone-201-occupancy",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-colder-supply-air-requests",
+        "@id": "urn:ex/vav-506-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-discharge-air-temp",
+        "@id": "urn:ex/zone-113-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -20600,70 +20338,60 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-chilled-water-in",
+        "@id": "urn:ex/vav-522-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-chilled-water-in-connection"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-203-hvac-domain",
-        "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-203-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-203-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-305",
+        "@id": "urn:ex/vav-505-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-505-reheat-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-505-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-reheat-coil-valve-position",
+        "@id": "urn:ex/zone-309-310-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/room-309-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/zone-309-310-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-212-out",
+        "@id": "urn:ex/room-116-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -20679,161 +20407,168 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-213",
+        "@id": "urn:ex/vav-525-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-213-hvac-domain"
+                "@id": "urn:ex/connection-to-room-211"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-213-cooling-setpoint"
+                "@id": "urn:ex/vav-525-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/zone-213-heating-setpoint"
+                "@id": "urn:ex/vav-525-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/zone-213-occupancy"
+                "@id": "urn:ex/vav-525-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/zone-213-occupancy-override"
-            },
+                "@id": "urn:ex/vav-525-discharge-air-temp-setpoint"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-510-more-heat-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/zone-213-temp"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-531-air-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/zone-213-window-switch-on-off"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540",
+        "@id": "urn:ex/vav-509",
         "@type": [
             "http://data.ashrae.org/standard223#SingleDuctTerminal",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-540-air-in"
+                "@id": "urn:ex/vav-509-air-in"
             },
             {
-                "@id": "urn:ex/vav-540-air-out"
+                "@id": "urn:ex/vav-509-air-out"
             },
             {
-                "@id": "urn:ex/vav-540-hot-water-in"
+                "@id": "urn:ex/vav-509-hot-water-in"
             },
             {
-                "@id": "urn:ex/vav-540-hot-water-out"
+                "@id": "urn:ex/vav-509-hot-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-540-damper"
+                "@id": "urn:ex/vav-509-damper"
             },
             {
-                "@id": "urn:ex/vav-540-reheat-coil"
+                "@id": "urn:ex/vav-509-reheat-coil"
             },
             {
-                "@id": "urn:ex/vav-540-reheat-coil-valve"
+                "@id": "urn:ex/vav-509-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-hot-water-out",
+        "@id": "urn:ex/vav-517-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-521-hot-water-out-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-damper",
+        "@id": "urn:ex/zone-214-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-516-damper-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-516-damper-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-516-damper-command"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-516-damper-position"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-210-occupancy-override",
+        "@id": "urn:ex/zone-301",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:ex/room-301-hvac-domain"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-503-reheat-coil-valve-position",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-540-more-heat-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+                "@id": "urn:ex/zone-301-cooling-setpoint"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/zone-301-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-301-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-301-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-301-temp"
+            },
+            {
+                "@id": "urn:ex/zone-301-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-discharge-air-temp",
+        "@id": "urn:ex/zone-101-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
                 "@id": "http://qudt.org/vocab/quantitykind/Temperature"
@@ -20846,87 +20581,99 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-303-304-306-cooling-setpoint",
+        "@id": "urn:ex/vav-510-discharge-air-flow-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-304-in",
+        "@id": "urn:ex/vav-523-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/connection-to-room-303-304-306"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-air-in",
+        "@id": "urn:ex/vav-533",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-533-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-533-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-533-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-533-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-533-damper"
+            },
+            {
+                "@id": "urn:ex/vav-533-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-533-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-damper-in",
+        "@id": "urn:ex/vav-505-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-505-air-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-colder-supply-air-requests",
+        "@id": "urn:ex/vav-514-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-527-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -20942,131 +20689,145 @@
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-207",
+        "@id": "urn:ex/vav-512-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504",
+        "@id": "urn:ex/office-ahu-oa-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-504-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-504-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-504-hot-water-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-504-hot-water-out"
+                "@id": "urn:ex/office-ahu-oa-damper-in"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-504-damper"
-            },
+                "@id": "urn:ex/office-ahu-oa-temp"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-521-discharge-air-flow-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-504-reheat-coil"
-            },
+                "@id": "urn:ex/vav-521-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-504-reheat-coil-valve"
+                "@id": "urn:ex/vav-521-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-occupancy-sensor",
+        "@id": "urn:ex/vav-538-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-206-hvac-domain"
+                "@id": "urn:ex/vav-538-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-206-occupancy"
+                "@id": "urn:ex/vav-538-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-reheat-coil-water-in",
+        "@id": "urn:ex/zone-108-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-534-air-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-537-hot-water-in-connection"
+                "@id": "urn:ex/connection-to-room-314"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-537-hot-water-in"
+                "@id": "urn:ex/vav-534-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-534-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-534-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-534-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-537-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-523-air-in"
+                "@id": "urn:ex/vav-537-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-523-discharge-air-flow"
+                "@id": "urn:ex/vav-537-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-damper-in",
+        "@id": "urn:ex/room-205-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/connection-to-room-204-205"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-527-air-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/room-101-in",
+        "@id": "urn:ex/room-105-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-101"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -21076,145 +20837,133 @@
         ]
     },
     {
-        "@id": "urn:ex/room-308-hvac-domain",
+        "@id": "urn:ex/vav-520-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-308-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-308-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-discharge-air-flow",
+        "@id": "urn:ex/zone-213-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/room-213-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/zone-213-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-109-temp",
+        "@id": "urn:ex/room-106-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/connection-to-room-106-107"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-104-occupancy-sensor",
+        "@id": "urn:ex/zone-212-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-104-hvac-domain"
+                "@id": "urn:ex/room-212-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-104-occupancy"
+                "@id": "urn:ex/zone-212-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-310",
+        "@id": "urn:ex/vav-515-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-310-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-discharge-air-temp-setpoint",
+        "@id": "urn:ex/room-303-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/room-303-in"
+            },
+            {
+                "@id": "urn:ex/room-303-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-damper",
+        "@id": "urn:ex/office-ahu-moisture-eliminator",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#AirFilter",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Filter"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-537-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-537-damper-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-537-damper-command"
+                "@id": "urn:ex/office-ahu-moisture-eliminator-in"
             },
             {
-                "@id": "urn:ex/vav-537-damper-position"
+                "@id": "urn:ex/office-ahu-moisture-eliminator-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-112-114-occupancy-sensor",
+        "@id": "urn:ex/vav-539-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-112-hvac-domain"
+                "@id": "urn:ex/vav-539-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-112-114-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-hot-water-in-connection",
+        "@id": "urn:ex/vav-524-hot-water-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -21226,63 +20975,60 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-535-discharge-air-temp",
+        "@id": "urn:ex/vav-519-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/vav-519-hot-water-out-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-519-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-hot-water-out",
+        "@id": "urn:ex/vav-528-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-529-hot-water-out-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-207-hvac-domain",
+        "@id": "urn:ex/vav-529-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-207-in"
-            },
-            {
-                "@id": "urn:ex/room-207-out"
+                "@id": "urn:ex/vav-529-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-duct-after-ra-fan",
+        "@id": "urn:ex/connection-to-room-313",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -21294,39 +21040,39 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-501",
+        "@id": "urn:ex/vav-506-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-501-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-501-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-501-hot-water-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-501-hot-water-out"
+                "@id": "urn:ex/vav-506-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-501-damper"
-            },
+                "@id": "urn:ex/vav-506-discharge-air-flow"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-503-damper-command",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-501-reheat-coil"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-501-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-colder-supply-air-requests",
+        "@id": "urn:ex/vav-518-more-heat-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -21337,212 +21083,161 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil-water-in",
+        "@id": "urn:ex/vav-538-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-533-hot-water-in-connection"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-533-hot-water-in"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-reheat-coil",
+        "@id": "urn:ex/room-309-in",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-517-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-517-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-517-reheat-coil-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-517-reheat-coil-water-out"
+                "@id": "urn:ex/connection-to-room-309-310"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510",
+        "@id": "urn:ex/vav-504-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-510-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-510-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-510-hot-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-510-hot-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-510-damper"
-            },
-            {
-                "@id": "urn:ex/vav-510-reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-510-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518",
+        "@id": "urn:ex/vav-531-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-518-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-518-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-518-hot-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-518-hot-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-518-damper"
-            },
-            {
-                "@id": "urn:ex/vav-518-reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-518-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-reheat-coil-valve",
+        "@id": "urn:ex/vav-530-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-537-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-537-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-530-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-537-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-530-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-537-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-530-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-301",
+        "@id": "urn:ex/zone-212-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/room-301-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-reheat-coil-valve-out",
+        "@id": "urn:ex/office-ahu-hot-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-510-hot-water-out-connection"
+                "@id": "urn:ex/office-ahu-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-510-hot-water-out"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-hot-water-in-connection",
+        "@id": "urn:ex/vav-538-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-reheat-coil-water-out",
+        "@id": "urn:ex/vav-531-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-509-pipe-hot-water-return-before-valve"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-air-in",
+        "@id": "urn:ex/room-113-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/connection-to-room-113"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -21552,18 +21247,19 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-503-more-heat-requests",
+        "@id": "urn:ex/connection-to-room-314",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-116-117-heating-setpoint",
+        "@id": "urn:ex/zone-210-cooling-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -21579,29 +21275,40 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-513-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-526-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-513-pipe-hot-water-return-before-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-reheat-coil-water-out",
+        "@id": "urn:ex/room-210",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
+            {
+                "@id": "urn:ex/room-210-hvac-domain"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-525-reheat-coil-valve-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-505-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-525-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -21611,52 +21318,52 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-118-occupancy-override",
+        "@id": "urn:ex/vav-527-more-heat-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-damper-actuator",
+        "@id": "urn:ex/zone-309-310-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-537-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-537-damper-command"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-509-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-508-air-in"
+                "@id": "urn:ex/vav-509-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-508-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-508-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -21670,135 +21377,94 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-206-window-switch-on-off",
+        "@id": "urn:ex/vav-520-more-heat-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-hot-water-in-connection",
+        "@id": "urn:ex/zone-105-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil-air-out",
+        "@id": "urn:ex/vav-509-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-104"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-503-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-503-more-heat-requests"
-            }
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-503-air-out"
+                "@id": "urn:ex/vav-509-damper"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/connection-to-room-116-117",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-509-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-hot-water-out",
+        "@id": "urn:ex/zone-103-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-506-hot-water-out-connection"
+                "@id": "urn:ex/room-103-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/zone-103-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-discharge-air-temp-setpoint",
+        "@id": "urn:ex/room-115",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/room-115-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil",
+        "@id": "urn:ex/room-302-in",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-532-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-532-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-532-reheat-coil-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-532-reheat-coil-water-out"
+                "@id": "urn:ex/connection-to-room-302"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-527-reheat-coil-valve-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-528-hot-water-out-connection"
+                "@id": "urn:ex/vav-527-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -21808,116 +21474,117 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-528-hot-water-out"
+                "@id": "urn:ex/vav-527-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-118",
+        "@id": "urn:ex/vav-536-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-536-pipe-hot-water-return-before-valve"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-503-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-529-air-in"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-529-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-528-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-515-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-515-reheat-coil-valve-command"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-hot-water-out-connection",
+        "@id": "urn:ex/vav-506-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil",
+        "@id": "urn:ex/zone-314-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-520-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-520-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-520-reheat-coil-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-520-reheat-coil-water-out"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-109-occupancy-sensor",
+        "@id": "urn:ex/vav-534-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-109-hvac-domain"
+                "@id": "urn:ex/vav-534-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-109-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-534-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-534-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-clg-coil-valve-out",
+        "@id": "urn:ex/vav-526-reheat-coil-valve-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-chilled-water-out-connection"
+                "@id": "urn:ex/vav-526-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -21927,51 +21594,49 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/office-ahu-chilled-water-out"
+                "@id": "urn:ex/vav-526-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-fan-start-cmd",
+        "@id": "urn:ex/vav-517-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/connection-to-room-105",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-307-out",
+        "@id": "urn:ex/vav-535-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-201-occupancy",
+        "@id": "urn:ex/zone-111-occupancy",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -21982,202 +21647,230 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-106-107-temp-sensor",
+        "@id": "urn:ex/zone-201-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-106-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-106-107-temp"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-reheat-coil-water-in",
+        "@id": "urn:ex/vav-514-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-539-hot-water-in-connection"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-539-hot-water-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-101-occupancy-sensor",
+        "@id": "urn:ex/vav-515-discharge-air-flow-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-101-hvac-domain"
+                "@id": "urn:ex/vav-515-air-in"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-101-occupancy"
+                "@id": "urn:ex/vav-515-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-514-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-514-hot-water-out-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-514-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-discharge-air-flow",
+        "@id": "urn:ex/vav-514-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/vav-514-hot-water-in-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-509-more-heat-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil-valve-command",
+        "@id": "urn:ex/zone-116-117-cooling-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-532-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-518-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-532-air-in"
+            }
+        ]
     },
     {
-        "@id": "urn:ex/vav-513-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-508-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-513-air-in"
+                "@id": "urn:ex/vav-508-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-513-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-508-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-508-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-108-hvac-domain",
+        "@id": "urn:ex/vav-508-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-108-in"
-            },
-            {
-                "@id": "urn:ex/room-108-out"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-117-out",
+        "@id": "urn:ex/vav-516-hot-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-516-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-heating-pid-output",
+        "@id": "urn:ex/vav-520-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-air-in",
+        "@id": "urn:ex/vav-505-reheat-coil-water-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-505-pipe-hot-water-return-before-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-oa-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/office-ahu-oa-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -22187,29 +21880,41 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-532-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-508-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-532-air-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-540-heating-pid-output",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-532-discharge-air-temp"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-hot-water-out",
+        "@id": "urn:ex/vav-509-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-533-hot-water-out-connection"
+                "@id": "urn:ex/vav-509-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -22219,92 +21924,117 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-532-damper-in",
+        "@id": "urn:ex/vav-514-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-532-air-in"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-discharge-air-flow-sensor",
+        "@id": "urn:ex/office-ahu-oa-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-511-air-in"
+                "@id": "http://data.ashrae.org/standard223#Role-Outside"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-511-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-525-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-538-reheat-coil-valve"
+                "@id": "urn:ex/vav-525-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-538-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-525-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-525-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-more-heat-requests",
+        "@id": "urn:ex/vav-509-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-air-filter-in",
+        "@id": "urn:ex/vav-527-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-duct-after-oa-ra-damper"
+                "@id": "urn:ex/vav-527-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-527-reheat-coil-valve-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/office-ahu-ma-temp"
+                "@id": "urn:ex/vav-527-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-527-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-duct-after-damper",
+        "@id": "urn:ex/connection-to-room-305",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -22316,65 +22046,60 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-506-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-526-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil-valve-actuator",
+        "@id": "urn:ex/office-ahu-oa-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-524-reheat-coil-valve"
+                "@id": "urn:ex/office-ahu-oa-damper-in"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-524-reheat-coil-valve-command"
+                "@id": "urn:ex/office-ahu-oa-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-hot-water-out-connection",
+        "@id": "urn:ex/room-210-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-210-in"
+            },
+            {
+                "@id": "urn:ex/room-210-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-534-duct-after-damper",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-111-heating-setpoint",
+        "@id": "urn:ex/zone-303-304-306-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -22388,9 +22113,9 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-510-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-517-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -22404,239 +22129,248 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-521-air-in",
+        "@id": "urn:ex/connection-to-room-111",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-511-reheat-coil-valve-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-511-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-reheat-coil-air-out",
+        "@id": "urn:ex/vav-506-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-113"
+                "@id": "urn:ex/vav-506-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-535-damper-command",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-509-heating-pid-output"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-509-more-heat-requests"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-509-air-out"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-511-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-511-reheat-coil-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-511-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-damper",
+        "@id": "urn:ex/zone-215",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-532-damper-in"
-            },
+                "@id": "urn:ex/room-215-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-532-damper-out"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-532-damper-command"
+                "@id": "urn:ex/zone-215-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-532-damper-position"
+                "@id": "urn:ex/zone-215-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-215-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-215-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-215-temp"
+            },
+            {
+                "@id": "urn:ex/zone-215-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-312",
+        "@id": "urn:ex/zone-302-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-312-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-536-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-discharge-air-flow-sensor",
+        "@id": "urn:ex/zone-301-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-539-air-in"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-539-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil-air-out",
+        "@id": "urn:ex/room-102-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-115"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-514-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-514-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-514-air-out"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-damper-command",
+        "@id": "urn:ex/vav-503-discharge-air-temp-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-203-temp",
+        "@id": "urn:ex/vav-539-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-312-temp",
+        "@id": "urn:ex/vav-508-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-508-air-in"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-503-hot-water-out-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-508-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-507-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-507-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-539-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -22648,10 +22382,14 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-525-duct-after-damper",
+        "@id": "urn:ex/room-313-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/connection-to-room-313"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -22660,68 +22398,92 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-moisture-eliminator-in",
+        "@id": "urn:ex/room-118-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-oa-in-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/room-118-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/room-118-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/office-ahu-oa-in"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-312-window-switch-on-off",
+        "@id": "urn:ex/vav-532-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-112-114-window-switch-on-off",
+        "@id": "urn:ex/zone-207-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "urn:ex/room-207-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-207-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-more-heat-requests",
+        "@id": "urn:ex/vav-502-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-discharge-air-temp",
+        "@id": "urn:ex/vav-512-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-202-temp",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -22735,269 +22497,271 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-538",
+        "@id": "urn:ex/vav-516-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-538-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-538-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-538-hot-water-in"
+                "@id": "urn:ex/vav-516-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/vav-538-hot-water-out"
+                "@id": "urn:ex/vav-516-reheat-coil-valve-out"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-538-damper"
-            },
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-538-reheat-coil"
+                "@id": "urn:ex/vav-516-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-538-reheat-coil-valve"
+                "@id": "urn:ex/vav-516-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-309-310-temp",
+        "@id": "urn:ex/vav-540-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-513-heating-pid-output",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-208-209-occupancy-sensor",
+        "@id": "urn:ex/vav-519-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-208-hvac-domain"
+                "@id": "urn:ex/vav-519-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-519-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-519-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-519-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/zone-208-209-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-204-205-temp-sensor",
+        "@id": "urn:ex/room-103-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-204-hvac-domain"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-204-205-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-temp-sensor",
+        "@id": "urn:ex/vav-522-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-206-hvac-domain"
+                "@id": "urn:ex/vav-522-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-522-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-522-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-522-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/zone-206-temp"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-118-window-switch-on-off",
+        "@id": "urn:ex/vav-524-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-damper-command",
+        "@id": "urn:ex/vav-514-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-514-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-514-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-hot-water-in",
+        "@id": "urn:ex/vav-525-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-532-hot-water-in-connection"
+                "@id": "urn:ex/vav-525-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-525-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-314-occupancy-sensor",
+        "@id": "urn:ex/connection-to-room-211",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/room-314-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-314-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-temp",
+        "@id": "urn:ex/vav-529-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Outside"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-damper-in",
+        "@id": "urn:ex/vav-526-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/office-ahu-duct-after-ra-fan"
+                "@id": "urn:ex/vav-526-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-526-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-cooling-pid-output",
+        "@id": "urn:ex/office-ahu-ea-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-damper-position",
+        "@id": "urn:ex/vav-506-cooling-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil-valve-actuator",
+        "@id": "urn:ex/room-101-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-527-reheat-coil-valve"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-527-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil-air-out",
+        "@id": "urn:ex/vav-510-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-201"
+                "@id": "urn:ex/vav-510-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -23007,55 +22771,70 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-516-heating-pid-output"
+                "@id": "urn:ex/vav-510-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-516-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-516-air-out"
+                "@id": "urn:ex/vav-510-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-air-out",
+        "@id": "urn:ex/vav-538-reheat-coil-valve-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-212"
+                "@id": "urn:ex/vav-538-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-526-heating-pid-output"
-            },
+                "@id": "urn:ex/vav-538-hot-water-out"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-537-hot-water-in-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-526-more-heat-requests"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-527-discharge-air-flow-setpoint",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-526-air-out"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-reheat-coil-air-in",
+        "@id": "urn:ex/vav-535-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-504-duct-after-damper"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -23065,24 +22844,24 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-502-more-heat-requests",
+        "@id": "urn:ex/room-103",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/room-103-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-hot-water-out",
+        "@id": "urn:ex/vav-534-hot-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-539-hot-water-out-connection"
+                "@id": "urn:ex/vav-534-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -23092,137 +22871,161 @@
         ]
     },
     {
-        "@id": "urn:ex/room-305-in",
+        "@id": "urn:ex/vav-515-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/connection-to-room-305"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil-water-out",
+        "@id": "urn:ex/vav-527-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-512-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-527-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-527-hot-water-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-519-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-505-air-out"
+                "@id": "urn:ex/vav-519-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-505-discharge-air-temp"
+                "@id": "urn:ex/vav-519-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-discharge-air-flow-setpoint",
+        "@id": "urn:ex/room-311",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/room-311-hvac-domain"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-531-discharge-air-flow-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:ex/vav-531-air-in"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/vav-531-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-539-reheat-coil-valve-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-hot-water-in",
+        "@id": "urn:ex/office-ahu-ra-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-530-hot-water-in-connection"
+                "@id": "urn:ex/office-ahu-ra-damper-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-ra-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/office-ahu-ra-damper-command"
+            },
+            {
+                "@id": "urn:ex/office-ahu-ra-damper-position"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Return"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-113-occupancy",
+        "@id": "urn:ex/room-205",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "urn:ex/room-205-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-reheat-coil-air-in",
+        "@id": "urn:ex/vav-506-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-539-duct-after-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-air-in",
+        "@id": "urn:ex/vav-523-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -23231,73 +23034,50 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-514-hot-water-out",
+        "@id": "urn:ex/vav-540-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-514-hot-water-out-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil-valve",
+        "@id": "urn:ex/office-ahu-ea-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-531-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-531-reheat-coil-valve-out"
+                "@id": "urn:ex/office-ahu-ea-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-531-reheat-coil-valve-command"
-            },
-            {
-                "@id": "urn:ex/vav-531-reheat-coil-valve-position"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-515-reheat-coil-valve-position",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/office-ahu-ea-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-517-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-536-hot-water-out-connection"
+                "@id": "urn:ex/vav-517-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -23307,391 +23087,453 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-536-hot-water-out"
+                "@id": "urn:ex/vav-517-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-air-filter",
+        "@id": "urn:ex/vav-523-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#AirFilter",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Filter"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-air-filter-in"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/office-ahu-air-filter-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-301-occupancy-sensor",
+        "@id": "urn:ex/zone-211-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-301-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-301-occupancy"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-312-temp-sensor",
+        "@id": "urn:ex/vav-528-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-312-hvac-domain"
+                "@id": "urn:ex/vav-528-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-312-temp"
+                "@id": "urn:ex/vav-528-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/connection-to-room-312",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-temp",
+        "@id": "urn:ex/vav-507-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Supply"
+                "@id": "urn:ex/vav-507-hot-water-out-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-507-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil-air-out",
+        "@id": "urn:ex/vav-530-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/connection-to-room-313"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-523-reheat-coil",
+        "@type": [
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-536-heating-pid-output"
+                "@id": "urn:ex/vav-523-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-536-more-heat-requests"
-            }
+                "@id": "urn:ex/vav-523-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-523-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-523-reheat-coil-water-out"
+            }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-536-air-out"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-damper",
+        "@id": "urn:ex/room-308-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-513-damper-in"
+                "@id": "urn:ex/room-308-in"
             },
             {
-                "@id": "urn:ex/vav-513-damper-out"
+                "@id": "urn:ex/room-308-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-513-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-513-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-540-discharge-air-flow-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-539-air-out"
+                "@id": "urn:ex/vav-540-air-in"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-539-discharge-air-temp"
+                "@id": "urn:ex/vav-540-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-hot-water-in-connection",
+        "@id": "urn:ex/vav-519-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-hot-water-out-connection",
+        "@id": "urn:ex/room-108-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-108-in"
+            },
+            {
+                "@id": "urn:ex/room-108-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-discharge-air-flow",
+        "@id": "urn:ex/vav-501-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/vav-501-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-501-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-501-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-501-reheat-coil-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-535-reheat-coil-valve-command",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-discharge-air-flow",
+        "@id": "urn:ex/vav-514-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/vav-514-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-514-discharge-air-flow"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-105-cooling-setpoint",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-206",
+        "@id": "urn:ex/vav-526-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-206-hvac-domain"
+                "@id": "urn:ex/vav-526-duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-fan-in",
+        "@id": "urn:ex/vav-508-reheat-coil-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-duct-after-clg-coil"
+                "@id": "urn:ex/vav-508-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/office-ahu-sa-flow"
+                "@id": "urn:ex/vav-508-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-512-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-512-air-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-512-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-530-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-508-reheat-coil-valve"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-508-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-heating-pid-output",
+        "@id": "urn:ex/vav-517-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-517-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/vav-517-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-524-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-524-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-524-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-524-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-524-reheat-coil-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-301-occupancy",
+        "@id": "urn:ex/vav-520-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "urn:ex/vav-520-hot-water-out-connection"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-213",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-213-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-air-in",
+        "@id": "urn:ex/vav-514-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-514-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-514-reheat-coil-valve-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-514-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-514-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-310-hvac-domain",
+        "@id": "urn:ex/vav-511-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-310-in"
+                "@id": "urn:ex/vav-511-damper-in"
             },
             {
-                "@id": "urn:ex/room-310-out"
+                "@id": "urn:ex/vav-511-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/connection-to-room-210",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-511-damper-command"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-511-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-damper-command",
+        "@id": "urn:ex/vav-504-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -23707,125 +23549,165 @@
         ]
     },
     {
-        "@id": "urn:ex/room-314",
+        "@id": "urn:ex/connection-to-room-102",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-314-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-damper-command",
+        "@id": "urn:ex/vav-524-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-524-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-reheat-coil-valve-out",
+        "@id": "urn:ex/zone-305",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-507-hot-water-out-connection"
+                "@id": "urn:ex/room-305-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-507-hot-water-out"
+                "@id": "urn:ex/zone-305-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-305-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-305-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-305-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-305-temp"
+            },
+            {
+                "@id": "urn:ex/zone-305-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil-water-out",
+        "@id": "urn:ex/vav-517-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-536-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-302-occupancy",
+        "@id": "urn:ex/room-311-out",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-occupancy-override",
+        "@id": "urn:ex/room-302-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:ex/room-302-in"
+            },
+            {
+                "@id": "urn:ex/room-302-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-109-cooling-setpoint",
+        "@id": "urn:ex/zone-203-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/room-203-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/zone-203-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-reheat-coil-air-in",
+        "@id": "urn:ex/vav-516-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-537-duct-after-damper"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-532-hot-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -23838,108 +23720,116 @@
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-536-reheat-coil-valve-position",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-532-hot-water-out"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil",
+        "@id": "urn:ex/vav-507-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-536-reheat-coil-air-in"
-            },
+                "@id": "urn:ex/connection-to-room-110"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-536-reheat-coil-air-out"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-536-reheat-coil-water-in"
+                "@id": "urn:ex/vav-507-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-536-reheat-coil-water-out"
+                "@id": "urn:ex/vav-507-more-heat-requests"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/vav-507-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil-valve",
+        "@id": "urn:ex/vav-534-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-524-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-524-reheat-coil-valve-out"
+                "@id": "urn:ex/connection-to-room-314"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-524-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-534-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-524-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-534-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-534-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-reheat-coil-valve-command",
+        "@id": "urn:ex/room-203",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/room-203-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-damper",
+        "@id": "urn:ex/vav-526-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-530-damper-in"
-            },
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-530-damper-out"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-530-damper-command"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-530-damper-position"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-104-cooling-setpoint",
+        "@id": "urn:ex/zone-302-cooling-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -23955,101 +23845,91 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-531-pipe-hot-water-return-before-valve",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-htg-coil-valve-out",
+        "@id": "urn:ex/vav-533-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-hot-water-out-connection"
+                "@id": "urn:ex/connection-to-room-305"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/office-ahu-hot-water-out"
+                "@id": "urn:ex/vav-533-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-533-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-533-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-hot-water-in-connection",
+        "@id": "urn:ex/connection-to-room-105",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-208-hvac-domain",
+        "@id": "urn:ex/zone-211-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-208-in"
-            },
-            {
-                "@id": "urn:ex/room-208-out"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-204-205-occupancy",
+        "@id": "urn:ex/vav-529-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-damper-out",
+        "@id": "urn:ex/vav-537-reheat-coil-valve-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-533-duct-after-damper"
+                "@id": "urn:ex/vav-537-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-533-colder-supply-air-requests"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-533-cooling-pid-output"
+                "@id": "urn:ex/vav-537-hot-water-out"
             }
         ]
     },
@@ -24070,266 +23950,275 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-526-hot-water-in",
+        "@id": "urn:ex/vav-506-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-526-hot-water-in-connection"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil-valve-actuator",
+        "@id": "urn:ex/office-ahu-supply-duct-static-pressure",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-520-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Role-Supply"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-520-reheat-coil-valve-command"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-109-occupancy",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-damper",
+        "@id": "urn:ex/vav-519-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-526-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-526-damper-out"
+                "@id": "urn:ex/vav-519-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-526-damper-command"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-526-damper-position"
+                "@id": "urn:ex/vav-519-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-hot-water-in",
+        "@id": "urn:ex/vav-518-reheat-coil-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-hot-water-in-connection"
+                "@id": "urn:ex/vav-518-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-518-hot-water-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil",
+        "@id": "urn:ex/vav-517-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-512-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-512-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-512-reheat-coil-water-in"
-            },
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-512-reheat-coil-water-out"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-537-colder-supply-air-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-303-304-306",
+        "@id": "urn:ex/vav-533-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/room-303-hvac-domain"
-            },
-            {
-                "@id": "urn:ex/room-304-hvac-domain"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-306-hvac-domain"
+                "@id": "urn:ex/vav-533-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-303-304-306-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-303-304-306-heating-setpoint"
+                "@id": "urn:ex/vav-533-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/zone-303-304-306-occupancy"
-            },
+                "@id": "urn:ex/vav-533-cooling-pid-output"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-105",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/zone-303-304-306-occupancy-override"
-            },
+                "@id": "urn:ex/room-105-hvac-domain"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-511-reheat-coil-valve-position",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/zone-303-304-306-temp"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-303-304-306-window-switch-on-off"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-reheat-coil-water-in",
+        "@id": "urn:ex/vav-531-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-509-hot-water-in-connection"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-509-hot-water-in"
+                "@id": "urn:ex/vav-531-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-hot-water-out-connection",
+        "@id": "urn:ex/vav-511-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-511-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-511-reheat-coil-valve-out"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-511-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-511-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-heating-pid-output",
+        "@id": "urn:ex/vav-525-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-525-hot-water-out-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-508-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-508-duct-after-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514",
+        "@id": "urn:ex/vav-517-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-514-air-in"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-514-air-out"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-531-reheat-coil-valve",
+        "@type": [
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-514-hot-water-in"
+                "@id": "urn:ex/vav-531-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/vav-514-hot-water-out"
+                "@id": "urn:ex/vav-531-reheat-coil-valve-out"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-514-damper"
-            },
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-514-reheat-coil"
+                "@id": "urn:ex/vav-531-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-514-reheat-coil-valve"
+                "@id": "urn:ex/vav-531-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-colder-supply-air-requests",
+        "@id": "urn:ex/vav-523-colder-supply-air-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -24340,249 +24229,254 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-525-hot-water-out",
+        "@id": "urn:ex/zone-101-co2-concentration",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#ofSubstance": [
             {
-                "@id": "urn:ex/vav-525-hot-water-out-connection"
+                "@id": "http://data.ashrae.org/standard223#Substance-CO2"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/MoleFraction"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PPM"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-528-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-537-air-in"
+                "@id": "urn:ex/vav-528-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-537-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-damper",
+        "@id": "urn:ex/vav-526-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Damper",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-529-damper-in"
+                "@id": "urn:ex/vav-526-damper-in"
             },
             {
-                "@id": "urn:ex/vav-529-damper-out"
+                "@id": "urn:ex/vav-526-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-529-damper-command"
+                "@id": "urn:ex/vav-526-damper-command"
             },
             {
-                "@id": "urn:ex/vav-529-damper-position"
+                "@id": "urn:ex/vav-526-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-hot-water-out",
+        "@id": "urn:ex/zone-215-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-513-hot-water-out-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-damper-in",
+        "@id": "urn:ex/zone-311-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-102-window-switch-on-off",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-533-air-in"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-discharge-air-flow-setpoint",
+        "@id": "urn:ex/zone-116-117-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/room-116-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/zone-116-117-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-damper",
+        "@id": "urn:ex/vav-536-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Damper",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-521-damper-in"
+                "@id": "urn:ex/vav-536-damper-in"
             },
             {
-                "@id": "urn:ex/vav-521-damper-out"
+                "@id": "urn:ex/vav-536-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-521-damper-command"
+                "@id": "urn:ex/vav-536-damper-command"
             },
             {
-                "@id": "urn:ex/vav-521-damper-position"
+                "@id": "urn:ex/vav-536-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-hot-water-in-connection",
+        "@id": "urn:ex/zone-116-117-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-302-temp-sensor",
+        "@id": "urn:ex/vav-540-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-302-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-302-temp"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-508-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-538-air-out"
+                "@id": "urn:ex/vav-508-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-538-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-discharge-air-flow",
+        "@id": "urn:ex/vav-511-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-303-304-306",
+        "@id": "urn:ex/vav-507-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-507-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-507-damper-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-524-hot-water-in-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-507-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-507-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-htg-coil-air-out",
+        "@id": "urn:ex/vav-511-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-duct-after-htg-coil"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-511-air-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-air-in",
+        "@id": "urn:ex/vav-522-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-522-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -24592,85 +24486,85 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-530-damper-out",
+        "@id": "urn:ex/vav-513-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-530-duct-after-damper"
+                "@id": "urn:ex/vav-513-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-530-colder-supply-air-requests"
-            },
-            {
-                "@id": "urn:ex/vav-530-cooling-pid-output"
-            }
         ]
     },
     {
-        "@id": "urn:ex/zone-101-building-static-pressure",
+        "@id": "urn:ex/vav-533-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-521-hot-water-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "urn:ex/vav-521-hot-water-in-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-116-117-temp",
+        "@id": "urn:ex/vav-518-cooling-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-202-cooling-setpoint",
+        "@id": "urn:ex/vav-518-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil-air-out",
+        "@id": "urn:ex/office-ahu-ra-fan-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-204-205"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -24678,94 +24572,116 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-521-heating-pid-output"
-            },
+                "@id": "urn:ex/office-ahu-ra-in"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/connection-to-room-214",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-521-more-heat-requests"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-510-damper-position",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-521-air-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil-water-in",
+        "@id": "urn:ex/vav-505-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-527-hot-water-in-connection"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-527-hot-water-in"
+                "@id": "urn:ex/vav-505-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-104-occupancy-override",
+        "@id": "urn:ex/room-112-out",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-525-hot-water-in-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-534-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-534-hot-water-out-connection"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-534-hot-water-out"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-damper-command",
+        "@id": "urn:ex/room-111-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/connection-to-room-111"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-311",
+        "@id": "urn:ex/vav-530-duct-after-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -24777,46 +24693,51 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-525-reheat-coil-water-in",
+        "@id": "urn:ex/vav-502-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-525-hot-water-in-connection"
+                "@id": "urn:ex/connection-to-room-101"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-525-hot-water-in"
+                "@id": "urn:ex/vav-502-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-502-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-502-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-502-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-507-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-108-heating-setpoint",
+        "@id": "urn:ex/zone-116-117-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -24830,137 +24751,150 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-522-discharge-air-flow",
+        "@id": "urn:ex/office-ahu-chilled-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-504-reheat-coil-valve-position",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil-air-in",
+        "@id": "urn:ex/vav-533-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-514-duct-after-damper"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-110-temp",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-533-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-cooling-pid-output",
+        "@id": "urn:ex/zone-301-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/room-301-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/zone-301-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-htg-coil-valve",
+        "@id": "urn:ex/vav-518-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-htg-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/office-ahu-htg-coil-valve-out"
+                "@id": "urn:ex/connection-to-room-202"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/office-ahu-htg-coil-valve-command"
+                "@id": "urn:ex/vav-518-heating-pid-output"
             },
             {
-                "@id": "urn:ex/office-ahu-htg-coil-valve-position"
+                "@id": "urn:ex/vav-518-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-518-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-damper-command",
+        "@id": "urn:ex/vav-529-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-213-window-switch-on-off",
+        "@id": "urn:ex/room-314-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/connection-to-room-314"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-105-occupancy-override",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-213-in",
+        "@id": "urn:ex/room-207-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-213"
+                "@id": "urn:ex/connection-to-room-207"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -24970,39 +24904,65 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-513-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-528-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-527-air-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-537-reheat-coil",
+        "@type": [
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-527-discharge-air-temp"
+                "@id": "urn:ex/vav-537-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-537-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-537-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-537-reheat-coil-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-531-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -25014,29 +24974,45 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-513-cooling-pid-output",
+        "@id": "urn:ex/zone-311-occupancy",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-518-discharge-air-flow",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-air-in",
+        "@id": "urn:ex/room-305-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -25046,51 +25022,39 @@
         ]
     },
     {
-        "@id": "urn:ex/room-310-in",
+        "@id": "urn:ex/vav-503-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/connection-to-room-309-310"
+                "@id": "urn:ex/vav-503-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-503-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-reheat-coil-valve",
+        "@id": "urn:ex/vav-523-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-539-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-539-reheat-coil-valve-out"
-            }
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "urn:ex/vav-523-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-539-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-539-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-523-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-524-discharge-air-flow-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -25106,266 +25070,289 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-519",
+        "@id": "urn:ex/vav-528-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-519-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-519-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-519-hot-water-in"
-            },
+                "@id": "urn:ex/connection-to-room-302"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-519-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-519-damper"
+                "@id": "urn:ex/vav-528-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-519-reheat-coil"
+                "@id": "urn:ex/vav-528-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/vav-519-reheat-coil-valve"
+                "@id": "urn:ex/vav-528-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-528-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-528-discharge-air-temp-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-damper-out",
+        "@id": "urn:ex/zone-303-304-306",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-538-duct-after-damper"
+                "@id": "urn:ex/room-303-hvac-domain"
+            },
+            {
+                "@id": "urn:ex/room-304-hvac-domain"
+            },
+            {
+                "@id": "urn:ex/room-306-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-538-colder-supply-air-requests"
+                "@id": "urn:ex/zone-303-304-306-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-538-cooling-pid-output"
+                "@id": "urn:ex/zone-303-304-306-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-303-304-306-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-303-304-306-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-303-304-306-temp"
+            },
+            {
+                "@id": "urn:ex/zone-303-304-306-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-cooling-pid-output",
+        "@id": "urn:ex/room-209-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/room-209-in"
+            },
+            {
+                "@id": "urn:ex/room-209-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-damper-out",
+        "@id": "urn:ex/vav-536-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-523-duct-after-damper"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-536-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-523-colder-supply-air-requests"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-523-cooling-pid-output"
+                "@id": "urn:ex/vav-536-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-damper-in",
+        "@id": "urn:ex/zone-202-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/room-202-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-512-air-in"
+                "@id": "urn:ex/zone-202-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-538-reheat-coil-valve-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-302-cooling-setpoint",
+        "@id": "urn:ex/vav-513-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-201-occupancy-sensor",
+        "@id": "urn:ex/vav-525-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-201-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-201-occupancy"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-215-temp-sensor",
+        "@id": "urn:ex/vav-512-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-215-hvac-domain"
+                "@id": "urn:ex/vav-512-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-512-reheat-coil-valve-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-215-temp"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-512-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-512-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-hot-water-in-connection",
+        "@id": "urn:ex/connection-to-room-109",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil-valve",
+        "@id": "urn:ex/vav-517",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-536-reheat-coil-valve-in"
+                "@id": "urn:ex/vav-517-air-in"
             },
             {
-                "@id": "urn:ex/vav-536-reheat-coil-valve-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-517-air-out"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "urn:ex/vav-517-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-517-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-536-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-517-damper"
             },
             {
-                "@id": "urn:ex/vav-536-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-517-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-517-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-507-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-524-air-out"
+                "@id": "urn:ex/vav-507-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-524-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-208-in",
+        "@id": "urn:ex/room-301-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-208-209"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -25375,72 +25362,83 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-109-occupancy-override",
+        "@id": "urn:ex/vav-508-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-101-heating-setpoint",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/vav-508-reheat-coil-air-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-508-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-508-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-508-reheat-coil-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-damper-position",
+        "@id": "urn:ex/vav-515-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-chilled-water-in-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-heating-pid-output",
+        "@id": "urn:ex/vav-528-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-528-hot-water-in-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-528-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-110-in",
+        "@id": "urn:ex/vav-540-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-110"
+                "@id": "urn:ex/vav-540-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -25450,58 +25448,46 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-515-damper-actuator",
+        "@id": "urn:ex/vav-515-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-515-damper"
+                "@id": "urn:ex/vav-515-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-515-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-105-heating-setpoint",
+        "@id": "urn:ex/zone-314-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/room-314-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/zone-314-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-107-in",
+        "@id": "urn:ex/vav-510-hot-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-106-107"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-510-hot-water-in-connection"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-538-hot-water-in-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -25510,7 +25496,7 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-532-damper-command",
+        "@id": "urn:ex/vav-516-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -25526,251 +25512,234 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-540-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-508-pipe-hot-water-return-before-valve"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-damper-out",
+        "@id": "urn:ex/zone-305-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-534-duct-after-damper"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-520-reheat-coil-valve-command",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-534-colder-supply-air-requests"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-534-cooling-pid-output"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539",
+        "@id": "urn:ex/vav-523-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-539-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-539-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-539-hot-water-in"
-            },
+                "@id": "urn:ex/connection-to-room-206"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-539-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-539-damper"
+                "@id": "urn:ex/vav-523-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-539-reheat-coil"
+                "@id": "urn:ex/vav-523-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/vav-539-reheat-coil-valve"
+                "@id": "urn:ex/vav-523-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-523-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-539-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-539-air-in"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/vav-539-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-530-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-530-hot-water-in-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-damper-actuator",
+        "@id": "urn:ex/vav-508-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-528-damper"
+                "@id": "urn:ex/vav-508-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-528-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-104-temp-sensor",
+        "@id": "urn:ex/vav-534-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/room-104-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-104-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523",
+        "@id": "urn:ex/vav-526-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-523-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-523-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-523-hot-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-523-hot-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-523-damper"
-            },
-            {
-                "@id": "urn:ex/vav-523-reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-523-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-reheat-coil-valve",
+        "@id": "urn:ex/vav-527-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-504-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-504-reheat-coil-valve-out"
+                "@id": "urn:ex/vav-527-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-504-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-527-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-504-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-527-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-more-heat-requests",
+        "@id": "urn:ex/vav-502-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-103",
+        "@id": "urn:ex/room-108",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/room-103-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/room-108-hvac-domain"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-540",
+        "@type": [
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/zone-103-cooling-setpoint"
+                "@id": "urn:ex/vav-540-air-in"
             },
             {
-                "@id": "urn:ex/zone-103-heating-setpoint"
+                "@id": "urn:ex/vav-540-air-out"
             },
             {
-                "@id": "urn:ex/zone-103-occupancy"
+                "@id": "urn:ex/vav-540-hot-water-in"
             },
             {
-                "@id": "urn:ex/zone-103-occupancy-override"
+                "@id": "urn:ex/vav-540-hot-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:ex/vav-540-damper"
             },
             {
-                "@id": "urn:ex/zone-103-temp"
+                "@id": "urn:ex/vav-540-reheat-coil"
             },
             {
-                "@id": "urn:ex/zone-103-window-switch-on-off"
+                "@id": "urn:ex/vav-540-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-529-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -25786,97 +25755,98 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-513-reheat-coil-water-in",
+        "@id": "urn:ex/vav-521-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-513-hot-water-in-connection"
+                "@id": "urn:ex/vav-521-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-521-reheat-coil-valve-command"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-duct-after-oa-ra-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-513-hot-water-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-reheat-coil-air-out",
+        "@id": "urn:ex/vav-520-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-102"
+                "@id": "urn:ex/vav-520-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-311-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-501-heating-pid-output"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-501-more-heat-requests"
+                "@id": "urn:ex/connection-to-room-311"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-501-air-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-311-occupancy-sensor",
+        "@id": "urn:ex/office-ahu-clg-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-311-hvac-domain"
+                "@id": "urn:ex/office-ahu-pipe-chilled-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-311-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-538-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-discharge-air-temp",
+        "@id": "urn:ex/zone-213-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
                 "@id": "http://qudt.org/vocab/quantitykind/Temperature"
@@ -25889,205 +25859,190 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-112-114-occupancy",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-air-filter-out",
+        "@id": "urn:ex/vav-506-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-duct-after-air-filter"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-506-air-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil-valve",
+        "@id": "urn:ex/vav-540-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-508-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-508-reheat-coil-valve-out"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-508-reheat-coil-valve-command"
-            },
-            {
-                "@id": "urn:ex/vav-508-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-306-in",
+        "@id": "urn:ex/vav-531-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-303-304-306"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-air-in",
+        "@id": "urn:ex/vav-521-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-cooling-pid-output",
+        "@id": "urn:ex/vav-522-reheat-coil-valve-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-311",
+        "@id": "urn:ex/room-214-in",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-311-hvac-domain"
+                "@id": "urn:ex/connection-to-room-214"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-111-occupancy",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-309-310-heating-setpoint",
+        "@id": "urn:ex/vav-526-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-526-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-519-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-528-air-out"
+                "@id": "urn:ex/connection-to-room-204-205"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-528-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-519-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-519-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-519-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-309-hvac-domain",
+        "@id": "urn:ex/zone-214-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-309-in"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/room-309-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-537-pipe-hot-water-return-before-valve",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-502-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-502-air-in"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-502-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-hot-water-in",
+        "@id": "urn:ex/vav-515-reheat-coil-valve-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-535-hot-water-in-connection"
+                "@id": "urn:ex/vav-515-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -26097,7 +26052,7 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-chilled-water-in-connection",
+        "@id": "urn:ex/vav-532-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -26109,262 +26064,231 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-539-hot-water-in",
+        "@id": "urn:ex/vav-530-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-539-hot-water-in-connection"
+                "@id": "urn:ex/vav-530-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-530-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-discharge-air-flow",
+        "@id": "urn:ex/vav-537-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/vav-537-duct-after-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/vav-537-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-537-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-312-heating-setpoint",
+        "@id": "urn:ex/vav-540-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-reheat-coil-water-in",
+        "@id": "urn:ex/vav-522-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-505-hot-water-in-connection"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-505-hot-water-in"
+                "@id": "urn:ex/vav-522-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-colder-supply-air-requests",
+        "@id": "urn:ex/room-112-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/room-112-in"
+            },
+            {
+                "@id": "urn:ex/room-112-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-warmer-supply-air-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-301-cooling-setpoint",
+        "@id": "urn:ex/room-309-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-309-310-occupancy-override",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-501-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-535-air-in"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-535-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-106",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/room-106-hvac-domain"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "http://data.ashrae.org/standard223#Role-Outside",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumerationKind-Role"
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-518-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-511-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-518-reheat-coil-valve"
+                "@id": "urn:ex/vav-511-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-518-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-511-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil-air-in",
+        "@id": "urn:ex/vav-502-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-533-duct-after-damper"
+                "@id": "urn:ex/vav-502-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-112-out",
+        "@id": "urn:ex/vav-520-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-520-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-520-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-hot-water-out",
+        "@id": "urn:ex/vav-539-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-hot-water-out-connection"
+                "@id": "urn:ex/vav-539-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-539-hot-water-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-reheat-coil-air-out",
+        "@id": "urn:ex/office-ahu-htg-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-103"
+                "@id": "urn:ex/office-ahu-duct-after-htg-coil"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-513-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-513-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-513-air-out"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-air-out",
+        "@id": "urn:ex/vav-539-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-111"
+                "@id": "urn:ex/connection-to-room-214"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -26374,23 +26298,23 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-510-discharge-air-flow"
+                "@id": "urn:ex/vav-539-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-510-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-539-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/vav-510-discharge-air-temp"
+                "@id": "urn:ex/vav-539-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/vav-510-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-539-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-temp",
+        "@id": "urn:ex/zone-110-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -26404,74 +26328,57 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-533-discharge-air-flow",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-501-damper-out",
+        "@id": "urn:ex/vav-528-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-501-duct-after-damper"
+                "@id": "urn:ex/vav-528-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-528-reheat-coil-valve-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-501-colder-supply-air-requests"
+                "@id": "urn:ex/vav-528-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-501-cooling-pid-output"
+                "@id": "urn:ex/vav-528-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-heating-pid-output",
+        "@id": "urn:ex/vav-523-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-reheat-coil-water-out",
+        "@id": "urn:ex/vav-504-reheat-coil-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-537-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-504-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -26481,89 +26388,39 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-540-damper",
-        "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-540-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-540-damper-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-540-damper-command"
-            },
-            {
-                "@id": "urn:ex/vav-540-damper-position"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-529-damper-position",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-529-colder-supply-air-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-537-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-524-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-537-air-out"
+                "@id": "urn:ex/vav-524-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-537-discharge-air-temp"
+                "@id": "urn:ex/vav-524-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-reheat-coil",
+        "@id": "urn:ex/vav-532-reheat-coil",
         "@type": [
             "http://data.ashrae.org/standard223#HeatingCoil",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-509-reheat-coil-air-in"
+                "@id": "urn:ex/vav-532-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/vav-509-reheat-coil-air-out"
+                "@id": "urn:ex/vav-532-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/vav-509-reheat-coil-water-in"
+                "@id": "urn:ex/vav-532-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/vav-509-reheat-coil-water-out"
+                "@id": "urn:ex/vav-532-reheat-coil-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasRole": [
@@ -26573,13 +26430,13 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-522-air-in",
+        "@id": "urn:ex/vav-535-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-535-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -26589,253 +26446,215 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-510-discharge-air-temp-sensor",
+        "@id": "urn:ex/connection-to-room-203",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-510-air-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-118-occupancy",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-510-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-211-hvac-domain",
+        "@id": "urn:ex/vav-540-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-211-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-211-out"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-hot-water-in",
+        "@id": "urn:ex/zone-103-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-537-hot-water-in-connection"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-reheat-coil-water-out",
+        "@id": "urn:ex/room-107-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-523-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/room-107-in"
+            },
+            {
+                "@id": "urn:ex/room-107-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil-valve-position",
+        "@id": "urn:ex/zone-207-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-damper",
+        "@id": "urn:ex/zone-207",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-538-damper-in"
-            },
+                "@id": "urn:ex/room-207-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-538-damper-out"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-538-damper-command"
+                "@id": "urn:ex/zone-207-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-538-damper-position"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-ea-damper-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
+                "@id": "urn:ex/zone-207-heating-setpoint"
+            },
             {
-                "@id": "urn:ex/office-ahu-ea-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+                "@id": "urn:ex/zone-207-occupancy"
+            },
             {
-                "@id": "urn:ex/office-ahu-ea-damper-command"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-clg-coil-water-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+                "@id": "urn:ex/zone-207-occupancy-override"
+            },
             {
-                "@id": "urn:ex/office-ahu-pipe-chilled-water-return-before-valve"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/zone-207-temp"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/zone-207-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-214",
+        "@id": "urn:ex/room-212",
         "@type": [
             "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
         "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/room-214-hvac-domain"
+                "@id": "urn:ex/room-212-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-in-connection",
+        "@id": "urn:ex/vav-521-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-hot-water-in",
+        "@id": "urn:ex/zone-303-304-306-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-534-hot-water-in-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-reheat-coil-water-out",
+        "@id": "urn:ex/vav-516-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-525-pipe-hot-water-return-before-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-discharge-air-flow",
+        "@id": "urn:ex/zone-101-co2-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/room-101-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/zone-101-co2-concentration"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-502-damper-actuator",
         "@type": [
             "http://data.ashrae.org/standard223#Actuator"
         ],
         "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-536-reheat-coil-valve"
+                "@id": "urn:ex/vav-502-damper"
             }
         ],
         "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-536-reheat-coil-valve-command"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-507-discharge-air-temp-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/vav-507-air-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:ex/vav-507-discharge-air-temp"
+                "@id": "urn:ex/vav-502-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-102-window-switch-on-off",
+        "@id": "urn:ex/zone-215-window-switch-on-off",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -26846,82 +26665,61 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-213-occupancy-override",
+        "@id": "urn:ex/vav-534-colder-supply-air-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-damper-actuator",
+        "@id": "urn:ex/vav-523-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-503-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-503-damper-command"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-210-occupancy-sensor",
+        "@id": "urn:ex/room-201",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/room-210-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/zone-210-occupancy"
+                "@id": "urn:ex/room-201-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521",
+        "@id": "urn:ex/vav-516-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-521-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-521-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-521-hot-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-521-hot-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-521-damper"
-            },
-            {
-                "@id": "urn:ex/vav-521-reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-521-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-523-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -26937,169 +26735,151 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-521-duct-after-damper",
+        "@id": "urn:ex/vav-529-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-duct-after-damper",
+        "@id": "urn:ex/office-ahu-clg-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-damper-position",
+        "@id": "urn:ex/zone-212-window-switch-on-off",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-538-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-537-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-526-reheat-coil-valve"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-526-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-537-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-hot-water-out",
+        "@id": "urn:ex/room-205-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-523-hot-water-out-connection"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-discharge-air-temp-sensor",
+        "@id": "urn:ex/zone-215-occupancy-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-529-air-out"
+                "@id": "urn:ex/room-215-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-529-discharge-air-temp"
+                "@id": "urn:ex/zone-215-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-fan",
+        "@id": "urn:ex/vav-538-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#FanWithVFD"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-ra-fan-in"
-            },
-            {
-                "@id": "urn:ex/office-ahu-ra-fan-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/office-ahu-ra-fan-power"
-            },
-            {
-                "@id": "urn:ex/office-ahu-ra-fan-speed-cmd"
-            },
-            {
-                "@id": "urn:ex/office-ahu-ra-fan-speed-status"
-            },
-            {
-                "@id": "urn:ex/office-ahu-ra-fan-start-cmd"
-            },
-            {
-                "@id": "urn:ex/office-ahu-ra-fan-start-status"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Return"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-511-damper-command",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-538-hot-water-in-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-temp",
+        "@id": "urn:ex/office-ahu-supply-duct-static-pressure-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Return"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/office-ahu-sa-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/office-ahu-supply-duct-static-pressure"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-colder-supply-air-requests",
+        "@id": "urn:ex/vav-529-more-heat-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -27110,93 +26890,129 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-513-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-521-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-521-hot-water-out-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-314-window-switch-on-off",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "urn:ex/vav-521-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-discharge-air-flow",
+        "@id": "urn:ex/zone-202",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/room-202-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/zone-202-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-202-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-202-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-202-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-202-temp"
+            },
+            {
+                "@id": "urn:ex/zone-202-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-cooling-pid-output",
+        "@id": "urn:ex/vav-510",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-510-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-510-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-510-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-510-hot-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/vav-510-damper"
+            },
+            {
+                "@id": "urn:ex/vav-510-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-510-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-cooling-setpoint",
+        "@id": "urn:ex/vav-510-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-510-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-510-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-510-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-510-reheat-coil-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-air-in",
+        "@id": "urn:ex/room-215-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -27206,88 +27022,109 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-527-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil-water-in",
+        "@id": "urn:ex/room-118",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-520-hot-water-in-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-520-hot-water-in"
+                "@id": "urn:ex/room-118-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-205-out",
+        "@id": "urn:ex/vav-514-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-514-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-514-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-514-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-514-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-510-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/connection-to-room-111"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-510-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-510-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-510-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-duct-after-damper",
+        "@id": "urn:ex/vav-516-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-516-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-516-damper-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-516-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-516-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-hot-water-in-connection",
+        "@id": "urn:ex/vav-523-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -27299,109 +27136,180 @@
         ]
     },
     {
-        "@id": "urn:ex/room-307",
+        "@id": "urn:ex/vav-505-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-307-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-damper-position",
+        "@id": "urn:ex/vav-506-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-506-reheat-coil-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-506-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-206-co2-sensor",
+        "@id": "urn:ex/vav-516-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-206-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-530-reheat-coil-valve-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/zone-206-co2-concentration"
+                "@id": "urn:ex/vav-530-pipe-hot-water-return-before-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-discharge-air-flow",
+        "@id": "urn:ex/vav-534-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/vav-534-hot-water-in-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/vav-534-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-reheat-coil",
+        "@id": "urn:ex/vav-537-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-538-reheat-coil-air-in"
+                "@id": "urn:ex/connection-to-room-312"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-537-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-538-reheat-coil-air-out"
+                "@id": "urn:ex/vav-537-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/vav-538-reheat-coil-water-in"
+                "@id": "urn:ex/vav-537-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/vav-538-reheat-coil-water-out"
+                "@id": "urn:ex/vav-537-discharge-air-temp-setpoint"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-514-air-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/connection-to-room-115"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-514-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-514-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-514-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-514-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-hot-water-out-connection",
+        "@id": "urn:ex/vav-516",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-516-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-516-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-516-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-516-hot-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:ex/vav-516-damper"
+            },
+            {
+                "@id": "urn:ex/vav-516-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-516-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-duct-after-damper",
+        "@id": "urn:ex/vav-537-duct-after-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -27413,13 +27321,18 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-505-more-heat-requests",
+        "@id": "urn:ex/vav-532-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-532-hot-water-in-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
@@ -27435,133 +27348,137 @@
         ]
     },
     {
-        "@id": "urn:ex/room-110-hvac-domain",
+        "@id": "urn:ex/room-118-out",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-110-in"
-            },
-            {
-                "@id": "urn:ex/room-110-out"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-201-heating-setpoint",
+        "@id": "urn:ex/vav-506-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-506-duct-after-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-502-reheat-coil-valve-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-502-reheat-coil-valve"
-            }
-        ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+                "@id": "urn:ex/vav-506-colder-supply-air-requests"
+            },
             {
-                "@id": "urn:ex/vav-502-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-506-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-215",
+        "@id": "urn:ex/vav-519-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-215-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-discharge-air-temp-sensor",
+        "@id": "urn:ex/zone-102-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-535-air-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-535-discharge-air-temp"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-heating-pid-output",
+        "@id": "urn:ex/room-304-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/connection-to-room-303-304-306"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-damper-position",
+        "@id": "urn:ex/connection-to-room-213",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-204-205-occupancy-override",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-522-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-522-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-522-damper-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-522-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-522-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-312-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -27577,74 +27494,96 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-531-damper-position",
+        "@id": "urn:ex/zone-313-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-more-heat-requests",
+        "@id": "urn:ex/vav-529-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-529-hot-water-out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-529-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-discharge-air-temp",
+        "@id": "urn:ex/vav-518-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/vav-518-reheat-coil-air-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-518-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-518-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-518-reheat-coil-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-101-temp-sensor",
+        "@id": "urn:ex/room-204-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-101-hvac-domain"
+                "@id": "urn:ex/room-204-in"
+            },
+            {
+                "@id": "urn:ex/room-204-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/zone-101-temp"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-duct-after-damper",
+        "@id": "urn:ex/vav-525-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-525-duct-after-damper"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -27653,39 +27592,56 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-513-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-534-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-513-air-out"
+                "@id": "urn:ex/vav-534-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-513-discharge-air-temp"
+                "@id": "urn:ex/vav-534-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-damper-actuator",
+        "@id": "urn:ex/vav-518-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-508-damper"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-507-discharge-air-temp",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-508-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-discharge-air-flow",
+        "@id": "urn:ex/vav-501-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -27696,209 +27652,229 @@
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-duct-after-damper",
+        "@id": "urn:ex/vav-501-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-heating-pid-output",
+        "@id": "urn:ex/zone-104-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-211",
+        "@id": "urn:ex/vav-536-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-211-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502",
+        "@id": "urn:ex/vav-503-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-502-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-502-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-502-hot-water-in"
-            },
+                "@id": "urn:ex/vav-503-hot-water-out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-502-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-502-damper"
-            },
-            {
-                "@id": "urn:ex/vav-502-reheat-coil"
-            },
-            {
-                "@id": "urn:ex/vav-502-reheat-coil-valve"
+                "@id": "urn:ex/vav-503-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-colder-supply-air-requests",
+        "@id": "urn:ex/vav-539-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-539-reheat-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-539-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil-water-in",
+        "@id": "urn:ex/vav-521-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-528-hot-water-in-connection"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-528-hot-water-in"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-discharge-air-temp-sensor",
+        "@id": "urn:ex/room-313-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-520-air-out"
+                "@id": "urn:ex/room-313-in"
+            },
+            {
+                "@id": "urn:ex/room-313-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-520-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-heating-pid-output",
+        "@id": "urn:ex/vav-522-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil-air-in",
+        "@id": "urn:ex/vav-512-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-521-duct-after-damper"
+                "@id": "urn:ex/connection-to-room-118"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-501-hot-water-out-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-512-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-512-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-512-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-512-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-duct-after-damper",
+        "@id": "urn:ex/zone-101",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/room-101-hvac-domain"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-108",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/room-108-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/zone-101-building-static-pressure"
+            },
+            {
+                "@id": "urn:ex/zone-101-building-static-pressure-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-101-co2-concentration"
+            },
+            {
+                "@id": "urn:ex/zone-101-co2-concentration-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-101-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-101-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-101-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-101-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-101-temp"
+            },
+            {
+                "@id": "urn:ex/zone-101-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-damper-out",
+        "@id": "urn:ex/vav-517-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-505-duct-after-damper"
+                "@id": "urn:ex/connection-to-room-203"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -27908,61 +27884,48 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-505-colder-supply-air-requests"
+                "@id": "urn:ex/vav-517-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-505-cooling-pid-output"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-534-discharge-air-flow",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/vav-517-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/vav-517-discharge-air-temp"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/vav-517-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-201-hvac-domain",
+        "@id": "urn:ex/office-ahu-air-filter-in",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-201-in"
-            },
+                "@id": "urn:ex/office-ahu-duct-after-oa-ra-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-201-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/office-ahu-ma-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-532-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-524-hot-water-out-connection"
+                "@id": "urn:ex/vav-532-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -27972,36 +27935,28 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-524-hot-water-out"
+                "@id": "urn:ex/vav-532-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-damper-out",
+        "@id": "urn:ex/vav-517-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-508-duct-after-damper"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-508-colder-supply-air-requests"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-508-cooling-pid-output"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-532-hot-water-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -28013,78 +27968,96 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-523-damper-command",
+        "@id": "urn:ex/vav-539-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-duct-after-damper",
+        "@id": "urn:ex/vav-514-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-514-hot-water-in-connection"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-514-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-damper-command",
+        "@id": "urn:ex/room-310-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/room-310-in"
+            },
+            {
+                "@id": "urn:ex/room-310-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-colder-chilled-water-requests",
+        "@id": "urn:ex/vav-533-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-114-out",
+        "@id": "urn:ex/vav-511-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-hot-water-out-connection",
+        "@id": "urn:ex/vav-529-hot-water-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -28096,76 +28069,69 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-520-damper-position",
+        "@id": "urn:ex/vav-540-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-118-occupancy-sensor",
+        "@id": "urn:ex/vav-519-discharge-air-flow-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-118-hvac-domain"
+                "@id": "urn:ex/vav-519-air-in"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-118-occupancy"
+                "@id": "urn:ex/vav-519-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-102",
+        "@id": "urn:ex/vav-514-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-102-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-105-hvac-domain",
+        "@type": [
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-102-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-102-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-102-occupancy"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/zone-102-occupancy-override"
+                "@id": "urn:ex/room-105-in"
             },
             {
-                "@id": "urn:ex/zone-102-temp"
-            },
+                "@id": "urn:ex/room-105-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/zone-102-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-damper-command",
+        "@id": "urn:ex/office-ahu-ra-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -28181,86 +28147,88 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil-water-in",
+        "@id": "urn:ex/vav-521-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-511-hot-water-in-connection"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-511-hot-water-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-314-temp-sensor",
+        "@id": "urn:ex/zone-101-occupancy-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-314-hvac-domain"
+                "@id": "urn:ex/room-101-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-314-temp"
+                "@id": "urn:ex/zone-101-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-hot-water-in-connection",
+        "@id": "urn:ex/vav-538-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-302-window-switch-on-off",
+        "@id": "urn:ex/vav-538-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-206-hvac-domain",
+        "@id": "urn:ex/vav-528-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-206-in"
-            },
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-206-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-528-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-colder-supply-air-requests",
+        "@id": "urn:ex/vav-503-colder-supply-air-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -28271,92 +28239,57 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil",
-        "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-511-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-511-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-511-reheat-coil-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-511-reheat-coil-water-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-536-discharge-air-flow-sensor",
+        "@id": "urn:ex/zone-302-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-536-air-in"
+                "@id": "urn:ex/room-302-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-536-discharge-air-flow"
+                "@id": "urn:ex/zone-302-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-damper-in",
+        "@id": "urn:ex/room-213-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-515-air-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/zone-105-occupancy-sensor",
+        "@id": "urn:ex/office-ahu-ea-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/room-105-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-105-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-air-out",
+        "@id": "urn:ex/vav-530-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-213"
+                "@id": "urn:ex/connection-to-room-303-304-306"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -28366,23 +28299,22 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-538-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-538-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-530-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-538-discharge-air-temp"
-            },
+                "@id": "urn:ex/vav-530-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-538-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-530-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-damper-command",
+        "@id": "urn:ex/vav-540-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -28396,320 +28328,369 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-air-in",
+        "@id": "urn:ex/zone-103-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-529-duct-after-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-hot-water-in",
+        "@id": "urn:ex/vav-520-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-506-hot-water-in-connection"
+                "@id": "urn:ex/vav-520-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-520-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-damper-position",
+        "@id": "urn:ex/vav-513-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-513-hot-water-out-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-513-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-damper-out",
+        "@id": "urn:ex/vav-513",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-517-duct-after-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-513-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-513-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-513-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-513-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-517-colder-supply-air-requests"
+                "@id": "urn:ex/vav-513-damper"
             },
             {
-                "@id": "urn:ex/vav-517-cooling-pid-output"
+                "@id": "urn:ex/vav-513-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-513-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-cooling-pid-output",
+        "@id": "urn:ex/vav-514-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil-valve-actuator",
+        "@id": "urn:ex/zone-110-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-512-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-512-reheat-coil-valve-command"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-reheat-coil-water-in",
+        "@id": "urn:ex/vav-520-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-518-hot-water-in-connection"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-518-hot-water-in"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-309-310",
+        "@id": "urn:ex/vav-515-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-103-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/connection-to-room-311",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-hot-water-in-connection",
+        "@id": "urn:ex/zone-302",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-302-hvac-domain"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-313-occupancy-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/room-313-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-313-occupancy"
+                "@id": "urn:ex/zone-302-co2-concentration"
+            },
+            {
+                "@id": "urn:ex/zone-302-co2-concentration-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-302-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-302-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-302-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-302-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-302-temp"
+            },
+            {
+                "@id": "urn:ex/zone-302-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-hot-water-out",
+        "@id": "urn:ex/vav-537-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-508-hot-water-out-connection"
+                "@id": "urn:ex/vav-537-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-537-reheat-coil-valve-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-537-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-537-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-111-window-switch-on-off",
+        "@id": "urn:ex/zone-201-occupancy-override",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-102-hvac-domain",
+        "@id": "urn:ex/vav-514-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-102-in"
-            },
-            {
-                "@id": "urn:ex/room-102-out"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-hot-water-out",
+        "@id": "urn:ex/vav-505-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-502-hot-water-out-connection"
+                "@id": "urn:ex/connection-to-room-108"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-505-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-505-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-505-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-discharge-air-temp",
+        "@id": "urn:ex/vav-507-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/vav-507-reheat-coil-air-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-507-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-507-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-507-reheat-coil-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-discharge-air-temp",
+        "@id": "urn:ex/vav-537",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/vav-537-air-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-537-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-537-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-537-hot-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-537-damper"
+            },
+            {
+                "@id": "urn:ex/vav-537-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-537-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-111-in",
+        "@id": "urn:ex/vav-533-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/connection-to-room-111"
+                "@id": "urn:ex/vav-533-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-533-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-hot-water-out-connection",
+        "@id": "urn:ex/vav-529-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -28721,39 +28702,39 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-533-cooling-pid-output",
+        "@id": "urn:ex/vav-513-reheat-coil-valve-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-valve-command",
+        "@id": "urn:ex/zone-206-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/room-206-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/zone-206-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-501-hot-water-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -28765,92 +28746,34 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-108-occupancy-sensor",
+        "@id": "urn:ex/zone-101-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-108-hvac-domain"
+                "@id": "urn:ex/room-101-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-108-occupancy"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-535",
-        "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-535-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-535-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-535-hot-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-535-hot-water-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-535-damper"
-            },
-            {
-                "@id": "urn:ex/vav-535-reheat-coil"
-            },
-            {
-                "@id": "urn:ex/vav-535-reheat-coil-valve"
+                "@id": "urn:ex/zone-101-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-203",
+        "@id": "urn:ex/vav-539-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/room-203-hvac-domain"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-203-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-203-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-203-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-203-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-203-temp"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/zone-203-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-206-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -28866,116 +28789,125 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-515-heating-pid-output",
+        "@id": "urn:ex/vav-504-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/connection-to-room-105"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-203-heating-setpoint",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-504-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-504-more-heat-requests"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-504-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-203",
+        "@id": "urn:ex/vav-508-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-fan-start-cmd",
+        "@id": "urn:ex/vav-534-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "urn:ex/vav-534-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-534-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-111",
+        "@id": "urn:ex/connection-to-room-215",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-111-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-discharge-air-temp-sensor",
+        "@id": "urn:ex/zone-105-occupancy-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-504-air-out"
+                "@id": "urn:ex/room-105-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-504-discharge-air-temp"
+                "@id": "urn:ex/zone-105-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-damper-in",
+        "@id": "urn:ex/vav-511-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-511-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-511-damper-command"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-503-more-heat-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-511-air-in"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-air-out",
+        "@id": "urn:ex/vav-502-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-303-304-306"
+                "@id": "urn:ex/vav-502-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -28985,95 +28917,117 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-530-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-530-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-530-discharge-air-temp"
+                "@id": "urn:ex/vav-502-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-530-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-502-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-206-in",
+        "@id": "urn:ex/vav-504-hot-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-206"
+                "@id": "urn:ex/vav-504-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-305-temp",
+        "@id": "urn:ex/vav-531-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-531-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-reheat-coil-water-in",
+        "@id": "urn:ex/vav-532-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-522-hot-water-in-connection"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-311-window-switch-on-off",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-536-reheat-coil-water-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-536-hot-water-in-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-522-hot-water-in"
+                "@id": "urn:ex/vav-536-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil",
+        "@id": "urn:ex/vav-503-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-506-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-506-reheat-coil-air-out"
-            },
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-506-reheat-coil-water-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-531-hot-water-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-506-reheat-coil-water-out"
+                "@id": "urn:ex/vav-531-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
@@ -29089,134 +29043,113 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil",
+        "@id": "urn:ex/vav-534-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-508-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-508-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-508-reheat-coil-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-508-reheat-coil-water-out"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-519-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-529-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-530-air-in"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-530-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-air-out",
+        "@id": "urn:ex/vav-531-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-103"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-531-damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-531-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-513-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-513-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-513-discharge-air-temp"
+                "@id": "urn:ex/vav-531-damper-command"
             },
             {
-                "@id": "urn:ex/vav-513-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-531-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-301-temp-sensor",
+        "@id": "urn:ex/vav-518-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-301-hvac-domain"
+                "@id": "urn:ex/vav-518-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-301-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-302-in",
+        "@id": "urn:ex/zone-104-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/connection-to-room-302"
+                "@id": "urn:ex/room-104-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/zone-104-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-211-out",
+        "@id": "urn:ex/connection-to-room-116-117",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -29225,167 +29158,154 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-201",
+        "@id": "urn:ex/zone-213-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/room-201-hvac-domain"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-201-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-201-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-201-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-201-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-201-temp"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/zone-201-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-reheat-coil-valve",
+        "@id": "urn:ex/vav-528",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-501-reheat-coil-valve-in"
+                "@id": "urn:ex/vav-528-air-in"
             },
             {
-                "@id": "urn:ex/vav-501-reheat-coil-valve-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-528-air-out"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "urn:ex/vav-528-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-528-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-501-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-528-damper"
             },
             {
-                "@id": "urn:ex/vav-501-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-528-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-528-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-valve-command",
+        "@id": "urn:ex/connection-to-room-307-308",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-107-hvac-domain",
+        "@id": "urn:ex/vav-515-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-107-in"
-            },
+                "@id": "urn:ex/vav-515-hot-water-out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-107-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-515-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-duct-after-air-filter",
+        "@id": "urn:ex/zone-105-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-516-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-524-air-in"
+                "@id": "urn:ex/vav-516-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-524-discharge-air-flow"
+                "@id": "urn:ex/vav-516-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-duct-after-damper",
+        "@id": "urn:ex/vav-515-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/connection-to-room-116-117"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-103-occupancy-override",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:ex/vav-515-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-515-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-515-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-515-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-116-hvac-domain",
+        "@id": "urn:ex/room-301-hvac-domain",
         "@type": [
             "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-116-in"
+                "@id": "urn:ex/room-301-in"
             },
             {
-                "@id": "urn:ex/room-116-out"
+                "@id": "urn:ex/room-301-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasDomain": [
@@ -29395,175 +29315,189 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-510-hot-water-out",
+        "@id": "urn:ex/zone-109-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-510-hot-water-out-connection"
+                "@id": "urn:ex/room-109-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/zone-109-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-102-temp",
+        "@id": "urn:ex/zone-111",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/room-111-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-522-reheat-coil",
-        "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-522-reheat-coil-air-in"
+                "@id": "urn:ex/zone-111-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-522-reheat-coil-air-out"
+                "@id": "urn:ex/zone-111-heating-setpoint"
             },
             {
-                "@id": "urn:ex/vav-522-reheat-coil-water-in"
+                "@id": "urn:ex/zone-111-occupancy"
             },
             {
-                "@id": "urn:ex/vav-522-reheat-coil-water-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
+                "@id": "urn:ex/zone-111-occupancy-override"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/zone-111-temp"
+            },
+            {
+                "@id": "urn:ex/zone-111-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-hot-water-in",
+        "@id": "urn:ex/zone-301-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-520-hot-water-in-connection"
+                "@id": "urn:ex/room-301-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/zone-301-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil-valve-command",
+        "@id": "urn:ex/room-304",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/room-304-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-307-308-window-switch-on-off",
+        "@id": "urn:ex/vav-538-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "urn:ex/vav-538-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-538-reheat-coil-valve-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-538-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-538-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-201-window-switch-on-off",
+        "@id": "urn:ex/vav-523-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "urn:ex/vav-523-pipe-hot-water-return-before-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-309-310",
+        "@id": "urn:ex/vav-539-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-309-hvac-domain"
+                "@id": "urn:ex/vav-539-damper-in"
             },
             {
-                "@id": "urn:ex/room-310-hvac-domain"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-539-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-309-310-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-309-310-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-309-310-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-309-310-occupancy-override"
+                "@id": "urn:ex/vav-539-damper-command"
             },
             {
-                "@id": "urn:ex/zone-309-310-temp"
-            },
+                "@id": "urn:ex/vav-539-damper-position"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/connection-to-room-303-304-306",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-309-310-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-521-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-536-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-521-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-521-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-521-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-521-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-discharge-air-temp",
+        "@id": "urn:ex/vav-532-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -29584,505 +29518,399 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-112-114-temp",
+        "@id": "urn:ex/vav-518-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-208-209-temp",
+        "@id": "urn:ex/vav-529-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-hot-water-out",
+        "@id": "urn:ex/office-ahu-increased-air-pressure-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-535-hot-water-out-connection"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-513-duct-after-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-discharge-air-flow-setpoint",
+        "@id": "urn:ex/room-115-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/room-115-in"
+            },
+            {
+                "@id": "urn:ex/room-115-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil-valve",
+        "@id": "urn:ex/zone-305-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-533-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-533-reheat-coil-valve-out"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-533-reheat-coil-valve-command"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-533-reheat-coil-valve-position"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-307-308",
+        "@id": "urn:ex/vav-503-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-cooling-pid-output",
+        "@id": "urn:ex/zone-307-308-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/room-307-hvac-domain"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-502-hot-water-in-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/zone-307-308-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-104-in",
+        "@id": "urn:ex/zone-312-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-104"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-113",
+        "@id": "urn:ex/zone-104-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-water-in",
+        "@id": "urn:ex/vav-509-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-532-hot-water-in-connection"
+                "@id": "urn:ex/vav-509-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-532-hot-water-in"
+                "@id": "urn:ex/vav-509-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-509-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-514-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-512-air-in"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-512-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-damper-in",
+        "@id": "urn:ex/vav-517-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-duct-after-moisture-eliminator"
+                "@id": "urn:ex/vav-517-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/office-ahu-oa-flow"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/office-ahu-oa-temp"
+                "@id": "urn:ex/vav-517-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-302",
+        "@id": "urn:ex/vav-529-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-527-discharge-air-flow-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-527-air-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-527-discharge-air-flow"
+                "@id": "urn:ex/vav-529-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-damper",
+        "@id": "urn:ex/vav-527-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-531-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-531-damper-out"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-531-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-531-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-208-209-occupancy",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "urn:ex/vav-527-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu",
+        "@id": "urn:ex/zone-104",
         "@type": [
-            "http://data.ashrae.org/standard223#AirHandlingUnit"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-chilled-water-in"
-            },
-            {
-                "@id": "urn:ex/office-ahu-chilled-water-out"
-            },
-            {
-                "@id": "urn:ex/office-ahu-ea-out"
-            },
-            {
-                "@id": "urn:ex/office-ahu-hot-water-in"
-            },
-            {
-                "@id": "urn:ex/office-ahu-hot-water-out"
-            },
-            {
-                "@id": "urn:ex/office-ahu-oa-in"
-            },
-            {
-                "@id": "urn:ex/office-ahu-ra-in"
-            },
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/office-ahu-sa-out"
+                "@id": "urn:ex/room-104-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/office-ahu-air-filter"
-            },
-            {
-                "@id": "urn:ex/office-ahu-clg-coil"
-            },
-            {
-                "@id": "urn:ex/office-ahu-clg-coil-valve"
-            },
-            {
-                "@id": "urn:ex/office-ahu-ea-damper"
-            },
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/office-ahu-htg-coil"
-            },
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/office-ahu-htg-coil-valve"
+                "@id": "urn:ex/zone-104-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/office-ahu-moisture-eliminator"
+                "@id": "urn:ex/zone-104-heating-setpoint"
             },
             {
-                "@id": "urn:ex/office-ahu-oa-damper"
+                "@id": "urn:ex/zone-104-occupancy"
             },
             {
-                "@id": "urn:ex/office-ahu-ra-damper"
+                "@id": "urn:ex/zone-104-occupancy-override"
             },
             {
-                "@id": "urn:ex/office-ahu-ra-fan"
+                "@id": "urn:ex/zone-104-temp"
             },
             {
-                "@id": "urn:ex/office-ahu-sa-fan"
+                "@id": "urn:ex/zone-104-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-538-reheat-coil-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-501-hot-water-out-connection"
+                "@id": "urn:ex/vav-538-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-501-hot-water-out"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-524-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-524-hot-water-in-connection"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-539-cooling-pid-output",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/vav-524-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-305",
+        "@id": "urn:ex/office-ahu-clg-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-305-hvac-domain"
+                "@id": "urn:ex/office-ahu-chilled-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-305-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-305-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-305-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-305-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-305-temp"
-            },
+                "@id": "urn:ex/office-ahu-colder-chilled-water-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/zone-305-window-switch-on-off"
+                "@id": "urn:ex/office-ahu-chilled-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-hot-water-in-connection",
+        "@id": "urn:ex/room-109-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/connection-to-room-109"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-cooling-pid-output",
+        "@id": "urn:ex/zone-203-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-reheat-coil-valve",
+        "@id": "urn:ex/vav-510-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-525-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-525-reheat-coil-valve-out"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-525-reheat-coil-valve-command"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-525-reheat-coil-valve-position"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-108-out",
+        "@id": "urn:ex/room-310-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/connection-to-room-309-310"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -30092,303 +29920,320 @@
         ]
     },
     {
-        "@id": "urn:ex/room-210-hvac-domain",
+        "@id": "urn:ex/vav-520-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-210-in"
-            },
+                "@id": "urn:ex/vav-520-hot-water-out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-210-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-520-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526",
+        "@id": "urn:ex/vav-518-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-526-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-526-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-526-hot-water-in"
+                "@id": "urn:ex/vav-518-damper-in"
             },
             {
-                "@id": "urn:ex/vav-526-hot-water-out"
+                "@id": "urn:ex/vav-518-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-526-damper"
-            },
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-526-reheat-coil"
+                "@id": "urn:ex/vav-518-damper-command"
             },
             {
-                "@id": "urn:ex/vav-526-reheat-coil-valve"
+                "@id": "urn:ex/vav-518-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-521-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-506-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-506-reheat-coil-valve-command"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-310-out",
+        "@id": "urn:ex/vav-529-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-valve-command",
+        "@id": "urn:ex/zone-301-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-205-hvac-domain",
+        "@id": "urn:ex/room-302-out",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-205-in"
-            },
-            {
-                "@id": "urn:ex/room-205-out"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-103-in",
+        "@id": "urn:ex/vav-536-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/connection-to-room-103"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-more-heat-requests",
+        "@id": "urn:ex/zone-207-occupancy",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-heating-pid-output",
+        "@id": "urn:ex/vav-512-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-512-reheat-coil-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/vav-512-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-discharge-air-flow-setpoint",
+        "@id": "urn:ex/zone-111-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-reheat-coil-valve-out",
+        "@id": "urn:ex/zone-207-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-537-hot-water-out-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-539-hot-water-in-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-537-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-damper-out",
+        "@id": "urn:ex/zone-116-117-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-515-duct-after-damper"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-201-occupancy-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:ex/room-201-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-515-colder-supply-air-requests"
-            },
+                "@id": "urn:ex/zone-201-occupancy"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-511-pipe-hot-water-return-before-valve",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-515-cooling-pid-output"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-damper-position",
+        "@id": "urn:ex/vav-507-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-507-air-in"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-507-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-101-co2-concentration-setpoint",
+        "@id": "urn:ex/vav-503-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#ofSubstance": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Substance-CO2"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/MoleFraction"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PPM"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-reheat-coil-water-in",
+        "@id": "urn:ex/office-ahu-ra-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-538-hot-water-in-connection"
+                "@id": "http://data.ashrae.org/standard223#Role-Return"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-538-hot-water-in"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-116-out",
+        "@id": "urn:ex/vav-527-hot-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-527-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-314-out",
+        "@id": "urn:ex/room-214-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -30404,57 +30249,57 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-537-reheat-coil-valve-position",
+        "@id": "urn:ex/zone-210-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-519-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-520-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-damper-position",
+        "@id": "urn:ex/vav-505-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -30468,13 +30313,13 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil-air-out",
+        "@id": "urn:ex/vav-538-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-207"
+                "@id": "urn:ex/connection-to-room-213"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -30484,49 +30329,43 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-520-heating-pid-output"
+                "@id": "urn:ex/vav-538-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-520-more-heat-requests"
+                "@id": "urn:ex/vav-538-more-heat-requests"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-520-air-out"
+                "@id": "urn:ex/vav-538-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil-air-out",
+        "@id": "urn:ex/vav-520-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-112-114"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-520-damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-520-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-511-heating-pid-output"
+                "@id": "urn:ex/vav-520-damper-command"
             },
             {
-                "@id": "urn:ex/vav-511-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-511-air-out"
+                "@id": "urn:ex/vav-520-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-537-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -30538,45 +30377,13 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-508",
-        "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-508-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-508-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-508-hot-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-508-hot-water-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-508-damper"
-            },
-            {
-                "@id": "urn:ex/vav-508-reheat-coil"
-            },
-            {
-                "@id": "urn:ex/vav-508-reheat-coil-valve"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-535-air-out",
+        "@id": "urn:ex/vav-523-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-311"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -30584,153 +30391,127 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-535-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-535-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-535-discharge-air-temp"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-535-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-523-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-damper-out",
+        "@id": "urn:ex/vav-521-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-529-duct-after-damper"
+                "@id": "urn:ex/vav-521-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-529-colder-supply-air-requests"
-            },
-            {
-                "@id": "urn:ex/vav-529-cooling-pid-output"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-537-hot-water-in-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-damper-actuator",
+        "@id": "urn:ex/vav-512-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-525-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-525-damper-command"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-501-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-damper",
+        "@id": "urn:ex/vav-505-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-501-damper-in"
-            },
-            {
-                "@id": "urn:ex/vav-501-damper-out"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-501-damper-command"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-501-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-hot-water-out-connection",
+        "@id": "urn:ex/vav-504-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-504-hot-water-out-connection"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-504-hot-water-out"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil-air-in",
+        "@id": "urn:ex/vav-512-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-520-duct-after-damper"
+                "@id": "urn:ex/vav-512-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-512-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-314-occupancy-override",
+        "@id": "urn:ex/vav-502-colder-supply-air-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-air-in",
+        "@id": "urn:ex/vav-539-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -30743,126 +30524,107 @@
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-539-air-in"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-520-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-505-hot-water-out-connection"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-505-hot-water-out"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-307-308-occupancy",
+        "@id": "urn:ex/vav-531-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-duct-after-clg-coil",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-air-out",
+        "@id": "urn:ex/vav-522",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-302"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-528-discharge-air-flow"
+                "@id": "urn:ex/vav-522-air-in"
             },
             {
-                "@id": "urn:ex/vav-528-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-522-air-out"
             },
             {
-                "@id": "urn:ex/vav-528-discharge-air-temp"
+                "@id": "urn:ex/vav-522-hot-water-in"
             },
             {
-                "@id": "urn:ex/vav-528-discharge-air-temp-setpoint"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-520-damper-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-520-duct-after-damper"
+                "@id": "urn:ex/vav-522-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:ex/vav-522-damper"
+            },
             {
-                "@id": "urn:ex/vav-520-colder-supply-air-requests"
+                "@id": "urn:ex/vav-522-reheat-coil"
             },
             {
-                "@id": "urn:ex/vav-520-cooling-pid-output"
+                "@id": "urn:ex/vav-522-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-501-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-discharge-air-temp-setpoint",
+        "@id": "urn:ex/office-ahu-sa-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Supply"
+            }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -30876,197 +30638,227 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-511-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-526-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-526-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-209",
+        "@id": "urn:ex/zone-313-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-209-hvac-domain"
+                "@id": "urn:ex/room-313-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-313-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-305-temp-sensor",
+        "@id": "urn:ex/vav-507-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-305-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-305-temp"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-hot-water-in-connection",
+        "@id": "urn:ex/zone-109-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-109-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-109-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-502",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-509-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-502-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-502-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-502-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-502-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-502-damper"
+            },
+            {
+                "@id": "urn:ex/vav-502-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-502-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-115-window-switch-on-off",
+        "@id": "urn:ex/office-ahu-warmer-supply-air-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-damper-command",
+        "@id": "urn:ex/zone-115-cooling-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-damper-position",
+        "@id": "urn:ex/room-213-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/connection-to-room-213"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-damper-command",
+        "@id": "urn:ex/zone-203-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-reheat-coil-valve",
+        "@id": "urn:ex/zone-303-304-306-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-535-reheat-coil-valve-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-535-reheat-coil-valve-out"
+                "@id": "urn:ex/room-303-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "urn:ex/zone-303-304-306-occupancy"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-535-damper-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-535-reheat-coil-valve-command"
-            },
+                "@id": "urn:ex/vav-535-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-535-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-535-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-reheat-coil-water-in",
+        "@id": "urn:ex/vav-524-reheat-coil-valve-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-510-hot-water-in-connection"
+                "@id": "urn:ex/vav-524-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-510-hot-water-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/zone-215-heating-setpoint",
+        "@id": "urn:ex/zone-307-308-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-202-window-switch-on-off",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
@@ -31087,44 +30879,34 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-313",
+        "@id": "urn:ex/vav-502-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/room-313-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-210-heating-setpoint",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-313-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-313-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-313-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-313-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-313-temp"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-313-window-switch-on-off"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-513-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -31136,32 +30918,41 @@
         ]
     },
     {
-        "@id": "urn:ex/room-314-hvac-domain",
+        "@id": "urn:ex/vav-516-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-314-in"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/room-314-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-522-pipe-hot-water-return-before-valve",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-more-heat-requests",
+        "@id": "urn:ex/vav-537-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-537-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-537-damper-command"
             }
         ]
     },
@@ -31182,67 +30973,71 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-523-discharge-air-flow-setpoint",
+        "@id": "urn:ex/zone-311-cooling-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-fan-speed-cmd",
+        "@id": "urn:ex/room-314-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-hot-water-in-connection",
+        "@id": "urn:ex/room-303-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-air-in",
+        "@id": "urn:ex/vav-516-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-516-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-516-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-discharge-air-temp",
+        "@id": "urn:ex/vav-537-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -31263,103 +31058,64 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-502-reheat-coil-valve",
+        "@id": "urn:ex/office-ahu-clg-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-502-reheat-coil-valve-in"
-            },
-            {
-                "@id": "urn:ex/vav-502-reheat-coil-valve-out"
+                "@id": "urn:ex/office-ahu-chilled-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-502-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-502-reheat-coil-valve-position"
+                "@id": "urn:ex/office-ahu-chilled-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-duct-after-damper",
+        "@id": "urn:ex/vav-527-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/connection-to-room-301"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-530-duct-after-damper",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-104-occupancy",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-305-cooling-setpoint",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/vav-527-discharge-air-flow"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/vav-527-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-101",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
-        ],
-        "http://data.ashrae.org/standard223#encloses": [
+                "@id": "urn:ex/vav-527-discharge-air-temp"
+            },
             {
-                "@id": "urn:ex/room-101-hvac-domain"
+                "@id": "urn:ex/vav-527-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-hot-water-out",
+        "@id": "urn:ex/vav-521-hot-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-507-hot-water-out-connection"
+                "@id": "urn:ex/vav-521-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -31369,151 +31125,159 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-525-reheat-coil-valve-out",
+        "@id": "urn:ex/zone-110-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-525-hot-water-out-connection"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-110-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-525-hot-water-out"
+                "@id": "urn:ex/zone-110-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-air-out",
+        "@id": "urn:ex/office-ahu-ra-fan",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Fan",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#FanWithVFD"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-208-209"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/office-ahu-ra-fan-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/office-ahu-ra-fan-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-522-discharge-air-flow"
+                "@id": "urn:ex/office-ahu-ra-fan-power"
             },
             {
-                "@id": "urn:ex/vav-522-discharge-air-flow-setpoint"
+                "@id": "urn:ex/office-ahu-ra-fan-speed-cmd"
             },
             {
-                "@id": "urn:ex/vav-522-discharge-air-temp"
+                "@id": "urn:ex/office-ahu-ra-fan-speed-status"
             },
             {
-                "@id": "urn:ex/vav-522-discharge-air-temp-setpoint"
+                "@id": "urn:ex/office-ahu-ra-fan-start-cmd"
+            },
+            {
+                "@id": "urn:ex/office-ahu-ra-fan-start-status"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Return"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-301-hvac-domain",
+        "@id": "urn:ex/vav-518-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-301-in"
-            },
-            {
-                "@id": "urn:ex/room-301-out"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-damper-position",
+        "@id": "urn:ex/vav-529-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-reheat-coil",
+        "@id": "urn:ex/zone-313-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-528-reheat-coil-air-in"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-528-reheat-coil-air-out"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-ra-temp",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-528-reheat-coil-water-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#Role-Return"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-528-reheat-coil-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil",
+        "@id": "urn:ex/vav-506-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-516-reheat-coil-air-in"
-            },
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-516-reheat-coil-air-out"
-            },
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-516-reheat-coil-water-in"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-516-reheat-coil-water-out"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-504-pipe-hot-water-return-before-valve",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-air-in",
+        "@id": "urn:ex/room-212-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-532-duct-after-damper"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -31523,131 +31287,105 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-514-air-in",
+        "@id": "urn:ex/vav-533-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-533-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-533-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-215-out",
+        "@id": "urn:ex/office-ahu-moisture-eliminator-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/office-ahu-oa-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-506-colder-supply-air-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/office-ahu-oa-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534",
+        "@id": "urn:ex/vav-534-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-534-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-534-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-534-hot-water-in"
+                "@id": "urn:ex/vav-534-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/vav-534-hot-water-out"
+                "@id": "urn:ex/vav-534-reheat-coil-valve-out"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-534-damper"
-            },
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-534-reheat-coil"
+                "@id": "urn:ex/vav-534-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-534-reheat-coil-valve"
+                "@id": "urn:ex/vav-534-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-hot-water-in-connection",
+        "@id": "urn:ex/zone-103-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-damper-position",
+        "@id": "urn:ex/office-ahu-sa-fan-start-cmd",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil-valve-out",
+        "@id": "urn:ex/zone-211-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-515-hot-water-out-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-515-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-discharge-air-temp",
+        "@id": "urn:ex/vav-539-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -31668,158 +31406,133 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-520-damper-command",
+        "@id": "urn:ex/vav-507-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-206-co2-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/room-206-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-521-hot-water-in-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/zone-206-co2-concentration"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-211-temp-sensor",
+        "@id": "urn:ex/zone-210-occupancy-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-211-hvac-domain"
+                "@id": "urn:ex/room-210-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-211-temp"
+                "@id": "urn:ex/zone-210-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-302-heating-setpoint",
+        "@id": "urn:ex/vav-538-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-water-in",
+        "@id": "urn:ex/room-116-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-526-hot-water-in-connection"
+                "@id": "urn:ex/connection-to-room-116-117"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-526-hot-water-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-damper-out",
+        "@id": "urn:ex/office-ahu-sa-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-518-duct-after-damper"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-518-colder-supply-air-requests"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-518-cooling-pid-output"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-hot-water-out-connection",
+        "@id": "urn:ex/vav-520-colder-supply-air-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-511-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-501-air-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-501-discharge-air-temp"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-212-heating-setpoint",
+        "@id": "urn:ex/vav-505-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -31833,273 +31546,242 @@
         ]
     },
     {
-        "@id": "urn:ex/room-208-out",
+        "@id": "urn:ex/room-208-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/room-208-in"
+            },
+            {
+                "@id": "urn:ex/room-208-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-303-304-306-temp-sensor",
+        "@id": "urn:ex/vav-536",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-303-hvac-domain"
+                "@id": "urn:ex/vav-536-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-536-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-536-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-536-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/zone-303-304-306-temp"
+                "@id": "urn:ex/vav-536-damper"
+            },
+            {
+                "@id": "urn:ex/vav-536-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-536-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-532-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-516-air-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-516-discharge-air-temp"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ea-damper-out",
+        "@id": "urn:ex/vav-506-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-ea-out-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-506-damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-506-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/office-ahu-ea-out"
+                "@id": "urn:ex/vav-506-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-506-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil",
+        "@id": "urn:ex/vav-517-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-540-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-540-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-540-reheat-coil-water-in"
+                "@id": "urn:ex/vav-517-damper-in"
             },
             {
-                "@id": "urn:ex/vav-540-reheat-coil-water-out"
+                "@id": "urn:ex/vav-517-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/vav-517-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-517-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-210-temp-sensor",
+        "@id": "urn:ex/vav-504-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-210-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-210-temp"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-colder-supply-air-requests",
+        "@id": "urn:ex/vav-519-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-313-in",
+        "@id": "urn:ex/vav-509-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-313"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-501-damper-command",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-516-discharge-air-flow-setpoint",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/vav-509-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-reheat-coil-water-out",
+        "@id": "urn:ex/room-206-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-501-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/connection-to-room-206"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-discharge-air-flow",
+        "@id": "urn:ex/vav-539-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-520-reheat-coil-valve-command",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-527-heating-pid-output",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-reheat-coil-valve-out",
+        "@id": "urn:ex/room-104-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-502-hot-water-out-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/room-104-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-104-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-502-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-air-out",
+        "@id": "urn:ex/vav-516-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-203"
+                "@id": "urn:ex/vav-516-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -32109,108 +31791,81 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-517-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-517-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-517-discharge-air-temp"
+                "@id": "urn:ex/vav-516-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-517-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-516-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-505-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-509-hot-water-in-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-discharge-air-flow",
+        "@id": "urn:ex/vav-539-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/vav-539-reheat-coil-valve-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/vav-539-reheat-coil-valve-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-102-occupancy-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/room-102-hvac-domain"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:ex/vav-539-reheat-coil-valve-command"
+            },
             {
-                "@id": "urn:ex/zone-102-occupancy"
+                "@id": "urn:ex/vav-539-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-537-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-505-air-in"
+                "@id": "urn:ex/vav-537-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-505-discharge-air-flow"
+                "@id": "urn:ex/vav-537-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-reheat-coil-water-out",
+        "@id": "urn:ex/vav-539-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-502-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-539-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -32220,136 +31875,128 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-536-discharge-air-temp",
+        "@id": "urn:ex/vav-507-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/vav-507-hot-water-in-connection"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-507-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-hot-water-out",
+        "@id": "urn:ex/room-306",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-516-hot-water-out-connection"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-306-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-reheat-coil-water-in",
+        "@id": "urn:ex/vav-528-hot-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-507-hot-water-in-connection"
+                "@id": "urn:ex/vav-528-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-507-hot-water-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-damper-in",
+        "@id": "urn:ex/vav-505-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-515-reheat-coil-valve-command",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-510-air-in"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-522-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-522-air-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-309",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/room-309-hvac-domain"
+                "@id": "urn:ex/vav-522-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-reheat-coil-water-out",
+        "@id": "urn:ex/vav-525-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-526-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/connection-to-room-211"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-increased-air-pressure-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-525-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-525-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-525-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-215",
+        "@id": "urn:ex/vav-525-duct-after-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Duct"
@@ -32361,189 +32008,179 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-538-heating-pid-output",
+        "@id": "urn:ex/vav-534-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-water-out",
+        "@id": "urn:ex/room-209-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-540-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-526-damper-actuator",
+        "@id": "urn:ex/room-102-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-526-damper"
+                "@id": "urn:ex/connection-to-room-102"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-526-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-208-209",
+        "@id": "urn:ex/room-309-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/room-309-in"
+            },
+            {
+                "@id": "urn:ex/room-309-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-537-more-heat-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-reheat-coil-water-in",
+        "@id": "urn:ex/vav-530-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-503-hot-water-in-connection"
+                "@id": "urn:ex/vav-530-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-530-reheat-coil-valve-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-503-hot-water-in"
+                "@id": "urn:ex/vav-530-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-530-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-colder-supply-air-requests",
+        "@id": "urn:ex/vav-533-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-533-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-533-damper-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-507-hot-water-in-connection",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-533-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-533-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil-air-in",
+        "@id": "urn:ex/room-206-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-508-duct-after-damper"
+                "@id": "urn:ex/room-206-in"
+            },
+            {
+                "@id": "urn:ex/room-206-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-214-in",
+        "@id": "urn:ex/zone-202-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-214"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-113-hvac-domain",
+        "@id": "urn:ex/vav-526-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-113-in"
-            },
-            {
-                "@id": "urn:ex/room-113-out"
+                "@id": "urn:ex/vav-526-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-528-hot-water-in",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-528-hot-water-in-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-526-colder-supply-air-requests"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-526-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-504-reheat-coil-valve-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -32559,28 +32196,18 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil-water-in",
+        "@id": "urn:ex/room-207",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-515-hot-water-in-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-515-hot-water-in"
+                "@id": "urn:ex/room-207-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-air-in",
+        "@id": "urn:ex/vav-516-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -32596,23 +32223,23 @@
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-htg-coil",
+        "@id": "urn:ex/vav-514-reheat-coil",
         "@type": [
             "http://data.ashrae.org/standard223#HeatingCoil",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-htg-coil-air-in"
+                "@id": "urn:ex/vav-514-reheat-coil-air-in"
             },
             {
-                "@id": "urn:ex/office-ahu-htg-coil-air-out"
+                "@id": "urn:ex/vav-514-reheat-coil-air-out"
             },
             {
-                "@id": "urn:ex/office-ahu-htg-coil-water-in"
+                "@id": "urn:ex/vav-514-reheat-coil-water-in"
             },
             {
-                "@id": "urn:ex/office-ahu-htg-coil-water-out"
+                "@id": "urn:ex/vav-514-reheat-coil-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasRole": [
@@ -32622,131 +32249,156 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-535-hot-water-in-connection",
+        "@id": "urn:ex/room-111-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-111-in"
+            },
+            {
+                "@id": "urn:ex/room-111-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-damper-out",
+        "@id": "urn:ex/vav-538-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-522-duct-after-damper"
+                "@id": "urn:ex/vav-538-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-oa-damper-command",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-522-colder-supply-air-requests"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-522-cooling-pid-output"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507",
+        "@id": "urn:ex/vav-506-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-507-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-507-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-507-hot-water-in"
+                "@id": "urn:ex/vav-506-reheat-coil-valve-in"
             },
             {
-                "@id": "urn:ex/vav-507-hot-water-out"
+                "@id": "urn:ex/vav-506-reheat-coil-valve-out"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-507-damper"
-            },
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-507-reheat-coil"
+                "@id": "urn:ex/vav-506-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-507-reheat-coil-valve"
+                "@id": "urn:ex/vav-506-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-damper",
+        "@id": "urn:ex/vav-537-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-522-damper-in"
-            },
+                "@id": "urn:ex/vav-537-hot-water-in-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-522-damper-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-513-reheat-coil-valve-actuator",
+        "@type": [
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-522-damper-command"
-            },
+                "@id": "urn:ex/vav-513-reheat-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-522-damper-position"
+                "@id": "urn:ex/vav-513-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-cooling-pid-output",
+        "@id": "urn:ex/vav-527-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-colder-supply-air-requests",
+        "@id": "urn:ex/vav-529-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-529-pipe-hot-water-return-before-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-hot-water-in",
+        "@id": "urn:ex/vav-512-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-511-hot-water-in-connection"
+                "@id": "urn:ex/vav-512-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -32756,363 +32408,402 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-531-discharge-air-temp-sensor",
+        "@id": "urn:ex/zone-208-209-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-531-air-out"
+                "@id": "urn:ex/room-208-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-531-discharge-air-temp"
+                "@id": "urn:ex/zone-208-209-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-heating-pid-output",
+        "@id": "urn:ex/vav-535-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-discharge-air-flow-sensor",
+        "@id": "urn:ex/room-118-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-514-air-in"
+                "@id": "urn:ex/connection-to-room-118"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-514-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-211",
+        "@id": "urn:ex/zone-204-205-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-539-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-cooling-pid-output",
+        "@id": "urn:ex/vav-537-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-537-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-duct-after-damper",
+        "@id": "urn:ex/vav-515-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-515-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-515-damper-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-515-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-515-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-air-out",
+        "@id": "urn:ex/vav-539",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-206"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-539-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:ex/vav-539-air-out"
+            },
             {
-                "@id": "urn:ex/vav-523-discharge-air-flow"
+                "@id": "urn:ex/vav-539-hot-water-in"
             },
             {
-                "@id": "urn:ex/vav-523-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-539-hot-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:ex/vav-539-damper"
             },
             {
-                "@id": "urn:ex/vav-523-discharge-air-temp"
+                "@id": "urn:ex/vav-539-reheat-coil"
             },
             {
-                "@id": "urn:ex/vav-523-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-539-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-529-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/connection-to-room-303-304-306"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-529-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-529-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-529-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-529-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-212-occupancy-sensor",
+        "@id": "urn:ex/vav-501-discharge-air-flow-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-212-hvac-domain"
+                "@id": "urn:ex/vav-501-air-in"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-212-occupancy"
+                "@id": "urn:ex/vav-501-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-524-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/connection-to-room-210"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-516-colder-supply-air-requests",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-507-damper-position",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/vav-524-discharge-air-flow"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/vav-524-discharge-air-flow-setpoint"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-524-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-524-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-ra-fan-out",
+        "@id": "urn:ex/vav-503-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-duct-after-ra-fan"
+                "@id": "urn:ex/connection-to-room-104"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-503-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-503-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-503-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-503-discharge-air-temp-setpoint"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-reheat-coil-valve",
+        "@id": "urn:ex/vav-527",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-518-reheat-coil-valve-in"
+                "@id": "urn:ex/vav-527-air-in"
             },
             {
-                "@id": "urn:ex/vav-518-reheat-coil-valve-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-527-air-out"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "urn:ex/vav-527-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-527-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-518-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-527-damper"
             },
             {
-                "@id": "urn:ex/vav-518-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-527-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-527-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-hot-water-out",
+        "@id": "urn:ex/zone-312-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-530-hot-water-out-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-reheat-coil-valve-in",
+        "@id": "urn:ex/office-ahu-supply-duct-static-pressure-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-535-pipe-hot-water-return-before-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505",
+        "@id": "urn:ex/vav-514",
         "@type": [
             "http://data.ashrae.org/standard223#SingleDuctTerminal",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-505-air-in"
+                "@id": "urn:ex/vav-514-air-in"
             },
             {
-                "@id": "urn:ex/vav-505-air-out"
+                "@id": "urn:ex/vav-514-air-out"
             },
             {
-                "@id": "urn:ex/vav-505-hot-water-in"
+                "@id": "urn:ex/vav-514-hot-water-in"
             },
             {
-                "@id": "urn:ex/vav-505-hot-water-out"
+                "@id": "urn:ex/vav-514-hot-water-out"
             }
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-505-damper"
+                "@id": "urn:ex/vav-514-damper"
             },
             {
-                "@id": "urn:ex/vav-505-reheat-coil"
+                "@id": "urn:ex/vav-514-reheat-coil"
             },
             {
-                "@id": "urn:ex/vav-505-reheat-coil-valve"
+                "@id": "urn:ex/vav-514-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-506-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-516-reheat-coil-valve"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-516-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-cooling-pid-output",
+        "@id": "urn:ex/zone-204-205-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/room-204-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/zone-204-205-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-103-window-switch-on-off",
+        "@id": "urn:ex/room-305-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "urn:ex/room-305-in"
+            },
+            {
+                "@id": "urn:ex/room-305-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-more-heat-requests",
+        "@id": "urn:ex/vav-517-colder-supply-air-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -33123,190 +32814,172 @@
         ]
     },
     {
-        "@id": "urn:ex/room-105-hvac-domain",
+        "@id": "urn:ex/zone-206-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-105-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-105-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-discharge-air-flow-setpoint",
+        "@id": "urn:ex/connection-to-room-208-209",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-508-duct-after-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil-water-in",
+        "@id": "urn:ex/vav-516-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-512-hot-water-in-connection"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-512-hot-water-in"
+                "@id": "urn:ex/vav-516-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-cooling-pid-output",
+        "@id": "urn:ex/vav-515-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-202",
+        "@id": "urn:ex/vav-506-more-heat-requests",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/room-202-hvac-domain"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-539-hot-water-out-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-202-cooling-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-202-heating-setpoint"
-            },
-            {
-                "@id": "urn:ex/zone-202-occupancy"
-            },
-            {
-                "@id": "urn:ex/zone-202-occupancy-override"
-            },
-            {
-                "@id": "urn:ex/zone-202-temp"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-202-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-reheat-coil-water-in",
+        "@id": "urn:ex/vav-520-reheat-coil-valve-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-524-hot-water-in-connection"
+                "@id": "urn:ex/vav-520-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-524-hot-water-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-damper-command",
+        "@id": "urn:ex/zone-101-building-static-pressure-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-hot-water-in-connection",
+        "@id": "urn:ex/zone-301-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-215-hvac-domain",
+        "@id": "urn:ex/zone-109-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-215-in"
-            },
-            {
-                "@id": "urn:ex/room-215-out"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-air-out",
+        "@id": "urn:ex/vav-521-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-215"
+                "@id": "urn:ex/connection-to-room-204-205"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -33316,94 +32989,141 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-540-discharge-air-flow"
+                "@id": "urn:ex/vav-521-discharge-air-flow"
             },
             {
-                "@id": "urn:ex/vav-540-discharge-air-flow-setpoint"
+                "@id": "urn:ex/vav-521-discharge-air-flow-setpoint"
             },
             {
-                "@id": "urn:ex/vav-540-discharge-air-temp"
+                "@id": "urn:ex/vav-521-discharge-air-temp"
             },
             {
-                "@id": "urn:ex/vav-540-discharge-air-temp-setpoint"
+                "@id": "urn:ex/vav-521-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-more-heat-requests",
+        "@id": "urn:ex/vav-540-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-516-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-516-duct-after-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-damper",
+        "@id": "urn:ex/office-ahu-htg-coil-valve-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/office-ahu-hot-water-out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/office-ahu-hot-water-out"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-523-damper",
         "@type": [
             "http://data.ashrae.org/standard223#Damper",
             "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-535-damper-in"
+                "@id": "urn:ex/vav-523-damper-in"
             },
             {
-                "@id": "urn:ex/vav-535-damper-out"
+                "@id": "urn:ex/vav-523-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-535-damper-command"
+                "@id": "urn:ex/vav-523-damper-command"
             },
             {
-                "@id": "urn:ex/vav-535-damper-position"
+                "@id": "urn:ex/vav-523-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-damper",
+        "@id": "urn:ex/vav-533-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-511-damper-in"
-            },
+                "@id": "urn:ex/vav-533-pipe-hot-water-return-before-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-511-damper-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/connection-to-room-106-107",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-511-damper-command"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-sa-fan-power",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-511-damper-position"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/W"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-discharge-air-flow",
+        "@id": "urn:ex/vav-530-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -33414,23 +33134,23 @@
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-535-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-516-hot-water-out-connection"
+                "@id": "urn:ex/vav-535-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -33440,110 +33160,81 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-516-hot-water-out"
+                "@id": "urn:ex/vav-535-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-reheat-coil-air-out",
+        "@id": "urn:ex/vav-523-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-110"
+                "@id": "urn:ex/vav-523-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-507-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-507-more-heat-requests"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-507-air-out"
+                "@id": "urn:ex/vav-523-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-sa-fan",
+        "@id": "urn:ex/vav-540-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#FanWithVFD"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/office-ahu-sa-fan-in"
-            },
-            {
-                "@id": "urn:ex/office-ahu-sa-fan-out"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/office-ahu-sa-fan-power"
-            },
-            {
-                "@id": "urn:ex/office-ahu-sa-fan-speed-cmd"
-            },
-            {
-                "@id": "urn:ex/office-ahu-sa-fan-speed-status"
-            },
-            {
-                "@id": "urn:ex/office-ahu-sa-fan-start-cmd"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-sa-fan-start-status"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Supply"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-204-in",
+        "@id": "urn:ex/vav-516-reheat-coil-valve-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-204-205"
+                "@id": "urn:ex/vav-516-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-526-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-517-air-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-517-discharge-air-temp"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-516-discharge-air-temp-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -33559,35 +33250,50 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-520-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-510-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-510-duct-after-damper"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-201-cooling-setpoint",
+        "@id": "urn:ex/office-ahu-htg-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-113-cooling-setpoint",
+        "@id": "urn:ex/room-204",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
+            {
+                "@id": "urn:ex/room-204-hvac-domain"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-504-discharge-air-temp-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -33603,470 +33309,547 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-514-damper-command",
+        "@id": "urn:ex/office-ahu",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#AirHandlingUnit"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/office-ahu-chilled-water-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-chilled-water-out"
+            },
+            {
+                "@id": "urn:ex/office-ahu-ea-out"
+            },
+            {
+                "@id": "urn:ex/office-ahu-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-hot-water-out"
+            },
+            {
+                "@id": "urn:ex/office-ahu-oa-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-ra-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-sa-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/office-ahu-air-filter"
+            },
+            {
+                "@id": "urn:ex/office-ahu-clg-coil"
+            },
+            {
+                "@id": "urn:ex/office-ahu-clg-coil-valve"
+            },
+            {
+                "@id": "urn:ex/office-ahu-ea-damper"
+            },
+            {
+                "@id": "urn:ex/office-ahu-htg-coil"
+            },
+            {
+                "@id": "urn:ex/office-ahu-htg-coil-valve"
+            },
+            {
+                "@id": "urn:ex/office-ahu-moisture-eliminator"
+            },
+            {
+                "@id": "urn:ex/office-ahu-oa-damper"
+            },
+            {
+                "@id": "urn:ex/office-ahu-ra-damper"
+            },
+            {
+                "@id": "urn:ex/office-ahu-ra-fan"
+            },
+            {
+                "@id": "urn:ex/office-ahu-sa-fan"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil-air-in",
+        "@id": "urn:ex/vav-516-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-511-duct-after-damper"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-damper-in",
+        "@id": "urn:ex/vav-523",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-523-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-523-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-523-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-523-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-509-air-in"
+                "@id": "urn:ex/vav-523-damper"
+            },
+            {
+                "@id": "urn:ex/vav-523-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-523-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-212",
+        "@id": "urn:ex/vav-508-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-212-hvac-domain"
+                "@id": "urn:ex/vav-508-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-508-discharge-air-temp"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-504",
+        "@type": [
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/zone-212-cooling-setpoint"
+                "@id": "urn:ex/vav-504-air-in"
             },
             {
-                "@id": "urn:ex/zone-212-heating-setpoint"
+                "@id": "urn:ex/vav-504-air-out"
             },
             {
-                "@id": "urn:ex/zone-212-occupancy"
+                "@id": "urn:ex/vav-504-hot-water-in"
             },
             {
-                "@id": "urn:ex/zone-212-occupancy-override"
+                "@id": "urn:ex/vav-504-hot-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:ex/vav-504-damper"
             },
             {
-                "@id": "urn:ex/zone-212-temp"
+                "@id": "urn:ex/vav-504-reheat-coil"
             },
             {
-                "@id": "urn:ex/zone-212-window-switch-on-off"
+                "@id": "urn:ex/vav-504-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-damper-out",
+        "@id": "urn:ex/vav-538-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-524-duct-after-damper"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-213",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-524-colder-supply-air-requests"
-            },
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-524-cooling-pid-output"
+                "@id": "urn:ex/room-213-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-118-out",
+        "@id": "urn:ex/vav-522-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "urn:ex/vav-522-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-522-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-108",
+        "@id": "urn:ex/vav-507-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-108-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-htg-coil",
+        "@type": [
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/zone-108-cooling-setpoint"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/zone-108-heating-setpoint"
+                "@id": "urn:ex/office-ahu-htg-coil-air-in"
             },
             {
-                "@id": "urn:ex/zone-108-occupancy"
+                "@id": "urn:ex/office-ahu-htg-coil-air-out"
             },
             {
-                "@id": "urn:ex/zone-108-occupancy-override"
+                "@id": "urn:ex/office-ahu-htg-coil-water-in"
             },
             {
-                "@id": "urn:ex/zone-108-temp"
-            },
+                "@id": "urn:ex/office-ahu-htg-coil-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/zone-108-window-switch-on-off"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-522-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-522-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-522-reheat-coil-valve-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-522-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-522-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-damper-position",
+        "@id": "urn:ex/vav-531",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-531-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-531-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-531-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-531-hot-water-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:ex/vav-531-damper"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/vav-531-reheat-coil"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:ex/vav-531-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-201",
+        "@id": "urn:ex/vav-509-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-201-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-oa-flow-sensor",
+        "@id": "urn:ex/zone-110-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/office-ahu-oa-damper-in"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/office-ahu-oa-flow"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-reheat-coil-valve",
+        "@id": "urn:ex/vav-532",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-538-reheat-coil-valve-in"
+                "@id": "urn:ex/vav-532-air-in"
             },
             {
-                "@id": "urn:ex/vav-538-reheat-coil-valve-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-532-air-out"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "urn:ex/vav-532-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-532-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-538-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-532-damper"
             },
             {
-                "@id": "urn:ex/vav-538-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-532-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-532-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-510-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-531-reheat-coil-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-506-hot-water-out-connection"
+                "@id": "urn:ex/vav-531-pipe-hot-water-return-before-valve"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-506-hot-water-out"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-cooling-pid-output",
+        "@id": "urn:ex/vav-524-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-524-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-524-reheat-coil-valve-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-524-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-524-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-hot-water-out",
+        "@id": "urn:ex/zone-215-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-536-hot-water-out-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-air-out",
+        "@id": "urn:ex/zone-212",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/connection-to-room-108"
+                "@id": "urn:ex/room-212-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-505-discharge-air-flow"
+                "@id": "urn:ex/zone-212-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-505-discharge-air-flow-setpoint"
+                "@id": "urn:ex/zone-212-heating-setpoint"
             },
             {
-                "@id": "urn:ex/vav-505-discharge-air-temp"
+                "@id": "urn:ex/zone-212-occupancy"
             },
             {
-                "@id": "urn:ex/vav-505-discharge-air-temp-setpoint"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-202-occupancy-sensor",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+                "@id": "urn:ex/zone-212-occupancy-override"
+            },
             {
-                "@id": "urn:ex/room-202-hvac-domain"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:ex/zone-212-temp"
+            },
             {
-                "@id": "urn:ex/zone-202-occupancy"
+                "@id": "urn:ex/zone-212-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-507-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/vav-507-reheat-coil-valve"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-515-pipe-hot-water-return-before-valve",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-507-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-539-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-539-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-539-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-reheat-coil-valve-out",
+        "@id": "urn:ex/room-314-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-539-hot-water-out-connection"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/room-314-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-314-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-539-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-reheat-coil-air-out",
+        "@id": "urn:ex/room-114-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-109"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-508-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-508-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-508-air-out"
-            }
         ]
     },
     {
-        "@id": "urn:ex/zone-313-window-switch-on-off",
+        "@id": "urn:ex/office-ahu-ra-fan-start-status",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -34077,38 +33860,52 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-514-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-502-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-514-reheat-coil-valve"
+                "@id": "urn:ex/vav-502-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-502-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-502-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-502-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/vav-514-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-104",
+        "@id": "urn:ex/office-ahu-hot-water-in-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-213",
+        "@id": "urn:ex/room-307-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -34117,280 +33914,283 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-312-occupancy-sensor",
+        "@id": "urn:ex/vav-515-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-312-hvac-domain"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/zone-312-occupancy"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-530-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-523-air-out"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-523-discharge-air-temp"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-damper-out",
+        "@id": "urn:ex/vav-507-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-531-duct-after-damper"
+                "@id": "urn:ex/vav-507-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-507-reheat-coil-valve-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-531-colder-supply-air-requests"
+                "@id": "urn:ex/vav-507-reheat-coil-valve-command"
             },
             {
-                "@id": "urn:ex/vav-531-cooling-pid-output"
+                "@id": "urn:ex/vav-507-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-air-out",
+        "@id": "urn:ex/vav-503-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-201"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-516-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-516-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-516-discharge-air-temp"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-516-discharge-air-temp-setpoint"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-water-out",
+        "@id": "urn:ex/vav-530-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-532-pipe-hot-water-return-before-valve"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-305-occupancy-override",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-more-heat-requests",
+        "@id": "urn:ex/vav-516-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-discharge-air-flow",
+        "@id": "urn:ex/room-311-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/room-311-in"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/room-311-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-air-in",
+        "@id": "urn:ex/vav-536-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-clg-coil-valve-actuator",
+        "@id": "urn:ex/zone-204-205-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-clg-coil-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/office-ahu-clg-coil-valve-command"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil-valve-position",
+        "@id": "urn:ex/room-113-out",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-colder-supply-air-requests",
+        "@id": "urn:ex/vav-507-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-507-air-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-507-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-discharge-air-flow-setpoint",
+        "@id": "urn:ex/zone-208-209-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-505-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-523-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-505-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-524-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-512-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-529-discharge-air-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-517-hot-water-out-connection"
+                "@id": "urn:ex/vav-529-air-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-529-discharge-air-temp"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-525-discharge-air-temp-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-517-hot-water-out"
+                "@id": "urn:ex/vav-525-air-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-525-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-hot-water-out-connection",
+        "@id": "urn:ex/vav-501-pipe-hot-water-return-before-valve",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -34402,77 +34202,77 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-212-temp",
+        "@id": "urn:ex/zone-212-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-314",
+        "@id": "urn:ex/vav-514-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-514-pipe-hot-water-return-before-valve"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-air-out",
+        "@id": "urn:ex/vav-522-hot-water-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-102"
+                "@id": "urn:ex/vav-522-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-501-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-501-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-501-discharge-air-temp"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-sa-fan-start-status",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-501-discharge-air-temp-setpoint"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-hot-water-out-connection",
+        "@id": "urn:ex/room-208-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/connection-to-room-208-209"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-524-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -34488,26 +34288,36 @@
         ]
     },
     {
-        "@id": "urn:ex/room-204-hvac-domain",
+        "@id": "urn:ex/vav-523-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-204-in"
+                "@id": "urn:ex/connection-to-room-206"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-523-heating-pid-output"
             },
             {
-                "@id": "urn:ex/room-204-out"
+                "@id": "urn:ex/vav-523-more-heat-requests"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-523-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-reheat-coil-valve-command",
+        "@id": "urn:ex/vav-532-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -34523,198 +34333,234 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-539-damper-actuator",
+        "@id": "urn:ex/office-ahu-duct-after-air-filter",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-539-damper"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-112-114-occupancy-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:ex/room-112-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-539-damper-command"
+                "@id": "urn:ex/zone-112-114-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-hot-water-in",
+        "@id": "urn:ex/vav-504-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-522-hot-water-in-connection"
+                "@id": "urn:ex/vav-504-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-hot-water-out-connection",
+        "@id": "urn:ex/office-ahu-clg-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/office-ahu-pipe-chilled-water-return-before-valve"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-114",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-114-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-213-temp-sensor",
+        "@id": "urn:ex/office-ahu-sa-flow-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-213-hvac-domain"
+                "@id": "urn:ex/office-ahu-sa-fan-in"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-213-temp"
+                "@id": "urn:ex/office-ahu-sa-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-reheat-coil-valve-in",
+        "@id": "urn:ex/zone-314-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-510-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/room-314-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/zone-314-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-519-hot-water-out",
+        "@id": "urn:ex/vav-538-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-519-hot-water-out-connection"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-damper-in",
+        "@id": "urn:ex/room-112-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/connection-to-room-112-114"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-520-air-in"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-damper-out",
+        "@id": "urn:ex/zone-206",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-537-duct-after-damper"
+                "@id": "urn:ex/room-206-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-537-colder-supply-air-requests"
+                "@id": "urn:ex/zone-206-co2-concentration"
             },
             {
-                "@id": "urn:ex/vav-537-cooling-pid-output"
+                "@id": "urn:ex/zone-206-co2-concentration-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-206-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-206-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-206-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-206-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-206-temp"
+            },
+            {
+                "@id": "urn:ex/zone-206-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-525-damper-in",
+        "@id": "urn:ex/vav-505",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#SingleDuctTerminal",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-505-air-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-505-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-505-hot-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-505-hot-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-525-air-in"
+                "@id": "urn:ex/vav-505-damper"
+            },
+            {
+                "@id": "urn:ex/vav-505-reheat-coil"
+            },
+            {
+                "@id": "urn:ex/vav-505-reheat-coil-valve"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-damper-actuator",
+        "@id": "urn:ex/room-208",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-510-damper"
+                "@id": "urn:ex/room-208-hvac-domain"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-111-window-switch-on-off",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-510-damper-command"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-air-in",
+        "@id": "urn:ex/room-210-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -34724,7 +34570,7 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-112-114-cooling-setpoint",
+        "@id": "urn:ex/zone-307-308-cooling-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -34740,491 +34586,485 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-528-discharge-air-temp",
+        "@id": "urn:ex/vav-530-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/vav-530-air-in"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-530-discharge-air-flow"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-505-more-heat-requests",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-reheat-coil-air-out",
+        "@id": "urn:ex/zone-111-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/connection-to-room-312"
+                "@id": "urn:ex/room-111-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/zone-111-occupancy"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-203-hvac-domain",
+        "@type": [
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-537-heating-pid-output"
+                "@id": "urn:ex/room-203-in"
             },
             {
-                "@id": "urn:ex/vav-537-more-heat-requests"
+                "@id": "urn:ex/room-203-out"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-537-air-out"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-air-out",
+        "@id": "urn:ex/zone-313-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-115"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/room-313-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-514-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-514-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-514-discharge-air-temp"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-514-discharge-air-temp-setpoint"
+                "@id": "urn:ex/zone-313-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-reheat-coil",
+        "@id": "urn:ex/vav-538-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-505-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-505-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-505-reheat-coil-water-in"
-            },
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-505-reheat-coil-water-out"
+                "@id": "urn:ex/vav-538-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/vav-538-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-hot-water-out-connection",
+        "@id": "urn:ex/room-306-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-306-in"
+            },
+            {
+                "@id": "urn:ex/room-306-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-hot-water-in",
+        "@id": "urn:ex/vav-517-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-512-hot-water-in-connection"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-517-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-311-cooling-setpoint",
+        "@id": "urn:ex/vav-528-discharge-air-flow-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-210-in",
+        "@id": "urn:ex/zone-102-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/connection-to-room-210"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-207-temp-sensor",
+        "@id": "urn:ex/zone-105",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/room-207-hvac-domain"
+                "@id": "urn:ex/room-105-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/zone-207-temp"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-513-discharge-air-temp",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:ex/zone-105-cooling-setpoint"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:ex/zone-105-heating-setpoint"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/zone-105-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-105-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-105-temp"
+            },
+            {
+                "@id": "urn:ex/zone-105-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil",
+        "@id": "urn:ex/vav-524-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-515-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-515-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-515-reheat-coil-water-in"
+                "@id": "urn:ex/vav-524-damper-in"
             },
             {
-                "@id": "urn:ex/vav-515-reheat-coil-water-out"
+                "@id": "urn:ex/vav-524-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:ex/vav-524-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-524-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-101",
+        "@id": "urn:ex/vav-506-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-discharge-air-flow-setpoint",
+        "@id": "urn:ex/zone-118-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:ex/room-118-hvac-domain"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/zone-118-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-503-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-501-air-in"
+                "@id": "urn:ex/vav-503-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-503-reheat-coil-valve-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-501-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-503-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-503-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-212",
+        "@id": "urn:ex/zone-210",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:ex/room-210-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/zone-210-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-210-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-210-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-210-occupancy-override"
+            },
             {
-                "@id": "urn:ex/room-212-hvac-domain"
+                "@id": "urn:ex/zone-210-temp"
+            },
+            {
+                "@id": "urn:ex/zone-210-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-531-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-529-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-529-reheat-coil-valve-command"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-reheat-coil-valve-out",
+        "@id": "urn:ex/room-202-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-513-hot-water-out-connection"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-513-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-511-discharge-air-temp",
+        "@id": "urn:ex/vav-522-damper-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
-            }
-        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-discharge-air-flow-sensor",
+        "@id": "urn:ex/zone-201-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-502-air-in"
+                "@id": "urn:ex/room-201-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-502-discharge-air-flow"
+                "@id": "urn:ex/zone-201-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-504-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-504-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/zone-208-209-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-chilled-water-out-connection",
+        "@id": "urn:ex/vav-532-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536",
+        "@id": "urn:ex/vav-517-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-536-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-536-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-536-hot-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-536-hot-water-out"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-536-damper"
-            },
-            {
-                "@id": "urn:ex/vav-536-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-536-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-damper-command",
+        "@id": "urn:ex/vav-528-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/zone-103-occupancy",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533",
+        "@id": "urn:ex/vav-524-hot-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-533-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-533-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-533-hot-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-533-hot-water-out"
+                "@id": "urn:ex/vav-524-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-533-damper"
-            },
-            {
-                "@id": "urn:ex/vav-533-reheat-coil"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-533-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-523-reheat-coil-air-out",
+        "@id": "urn:ex/vav-523-damper-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-206"
+                "@id": "urn:ex/vav-523-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -35234,200 +35074,235 @@
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-523-heating-pid-output"
+                "@id": "urn:ex/vav-523-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-523-more-heat-requests"
+                "@id": "urn:ex/vav-523-cooling-pid-output"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-530-hot-water-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-530-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-523-air-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-102-occupancy",
+        "@id": "urn:ex/zone-314-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-202-window-switch-on-off",
+        "@id": "urn:ex/vav-534-more-heat-requests",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-532-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-534-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-532-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-532-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-532-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-532-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-reheat-coil",
+        "@id": "urn:ex/vav-539-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-527-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-527-reheat-coil-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-527-reheat-coil-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-527-reheat-coil-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-103-hvac-domain",
+        "@id": "urn:ex/vav-534-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-103-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-103-out"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-309-out",
+        "@id": "urn:ex/vav-538-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-hot-water-in",
+        "@id": "urn:ex/vav-509-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-503-hot-water-in-connection"
+                "@id": "urn:ex/vav-509-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-509-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-509-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-509-reheat-coil-water-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-527-hot-water-out-connection",
+        "@id": "urn:ex/room-302",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/room-302-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-302-co2-concentration",
+        "@id": "urn:ex/vav-506-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#ofSubstance": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Substance-CO2"
+                "@id": "urn:ex/vav-506-duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-507-cooling-pid-output",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/MoleFraction"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PPM"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-air-in",
+        "@id": "urn:ex/vav-502-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-502-hot-water-out-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-502-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-discharge-air-flow-sensor",
+        "@id": "urn:ex/zone-104-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-520-air-in"
+                "@id": "urn:ex/room-104-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-520-discharge-air-flow"
+                "@id": "urn:ex/zone-104-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-discharge-air-temp-setpoint",
+        "@id": "urn:ex/zone-113-heating-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -35443,116 +35318,94 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-530-damper-command",
+        "@id": "urn:ex/zone-210-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-513-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-512-hot-water-out-connection"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-512-hot-water-out"
-            }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-reheat-coil-water-in",
+        "@id": "urn:ex/vav-530-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-502-hot-water-in-connection"
+                "@id": "urn:ex/vav-530-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-502-hot-water-in"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-510-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-529-hot-water-out-connection"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-529-hot-water-out"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-more-heat-requests",
+        "@id": "urn:ex/vav-536-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "urn:ex/vav-536-reheat-coil-valve"
+            }
+        ],
+        "http://data.ashrae.org/standard223#commandedByProperty": [
+            {
+                "@id": "urn:ex/vav-536-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-213-hvac-domain",
+        "@id": "urn:ex/vav-520-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-213-in"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-213-out"
+                "@id": "urn:ex/vav-520-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:ex/vav-520-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-damper-position",
+        "@id": "urn:ex/vav-515-reheat-coil-valve-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -35568,347 +35421,446 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-115",
+        "@id": "urn:ex/office-ahu-htg-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-115-hvac-domain"
+                "@id": "urn:ex/office-ahu-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/office-ahu-ea-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/zone-115-cooling-setpoint"
+                "@id": "urn:ex/office-ahu-ea-damper-in"
             },
             {
-                "@id": "urn:ex/zone-115-heating-setpoint"
-            },
+                "@id": "urn:ex/office-ahu-ea-damper-out"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/zone-115-occupancy"
+                "@id": "urn:ex/office-ahu-ea-damper-command"
             },
             {
-                "@id": "urn:ex/zone-115-occupancy-override"
-            },
+                "@id": "urn:ex/office-ahu-ea-damper-position"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:ex/zone-115-temp"
-            },
+                "@id": "http://data.ashrae.org/standard223#Role-Exhaust"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-523-discharge-air-flow-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/zone-115-window-switch-on-off"
+                "@id": "urn:ex/vav-523-air-in"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/vav-523-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-damper-actuator",
+        "@id": "urn:ex/vav-535-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-502-damper"
+                "@id": "urn:ex/vav-535-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-502-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-532-damper-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-532-duct-after-damper"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-532-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-532-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-damper-actuator",
+        "@id": "urn:ex/zone-314-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-534-damper"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-534-damper-command"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-516-hot-water-in",
+        "@id": "urn:ex/vav-512-damper-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-516-hot-water-in-connection"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-512-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-537-damper-position",
+        "@id": "urn:ex/vav-521-discharge-air-temp-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-more-heat-requests",
+        "@id": "urn:ex/zone-113-occupancy-override",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-HVACOperatingMode"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-537-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-reheat-coil-air-out",
+        "@id": "urn:ex/vav-530-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-303-304-306"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-530-damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-530-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-530-heating-pid-output"
+                "@id": "urn:ex/vav-530-damper-command"
             },
             {
-                "@id": "urn:ex/vav-530-more-heat-requests"
+                "@id": "urn:ex/vav-530-damper-position"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-523-discharge-air-temp",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/vav-530-air-out"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-511-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-reheat-coil-water-in",
+        "@id": "urn:ex/zone-208-209-occupancy-sensor",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:ex/room-208-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:ex/zone-208-209-occupancy"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-527-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-540-hot-water-in-connection"
+                "@id": "urn:ex/vav-527-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-524-reheat-coil-valve-position",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-540-hot-water-in"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-reheat-coil-valve",
+        "@id": "urn:ex/room-113",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-522-reheat-coil-valve-in"
-            },
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-522-reheat-coil-valve-out"
+                "@id": "urn:ex/room-113-hvac-domain"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-536-reheat-coil-valve-in",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "urn:ex/vav-536-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-522-reheat-coil-valve-command"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-522-reheat-coil-valve-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-302-occupancy-sensor",
+        "@id": "urn:ex/zone-214-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-302-hvac-domain"
+                "@id": "urn:ex/room-214-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-302-occupancy"
+                "@id": "urn:ex/zone-214-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-damper-position",
+        "@id": "urn:ex/vav-510-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-204-205-occupancy-sensor",
+        "@id": "urn:ex/zone-202-occupancy-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-204-hvac-domain"
+                "@id": "urn:ex/room-202-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-204-205-occupancy"
+                "@id": "urn:ex/zone-202-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-reheat-coil-air-in",
+        "@id": "urn:ex/vav-513-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-510-duct-after-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-201-temp-sensor",
+        "@id": "urn:ex/vav-507-hot-water-out-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/room-201-hvac-domain"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-101",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/zone-201-temp"
+                "@id": "urn:ex/room-101-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-502-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-525-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-502-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-305-hvac-domain",
+        "@id": "urn:ex/zone-303-304-306-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/room-305-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/room-305-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-hot-water-out",
+        "@id": "urn:ex/room-104",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:ex/vav-501-hot-water-out-connection"
+                "@id": "urn:ex/room-104-hvac-domain"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-513-hot-water-in-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -35917,104 +35869,113 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-533-air-out",
+        "@id": "urn:ex/vav-508-discharge-air-flow",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "urn:ex/connection-to-room-305"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-533-discharge-air-flow"
-            },
-            {
-                "@id": "urn:ex/vav-533-discharge-air-flow-setpoint"
-            },
-            {
-                "@id": "urn:ex/vav-533-discharge-air-temp"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-533-discharge-air-temp-setpoint"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-519-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-530-hot-water-out-connection"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-530-hot-water-out"
+                "@id": "urn:ex/vav-519-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-reheat-coil-valve",
+        "@id": "urn:ex/vav-535-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-510-reheat-coil-valve-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-516-reheat-coil-air-out",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-510-reheat-coil-valve-out"
+                "@id": "urn:ex/connection-to-room-201"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-510-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-516-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-510-reheat-coil-valve-position"
+                "@id": "urn:ex/vav-516-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-516-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-213-occupancy-sensor",
+        "@id": "urn:ex/vav-502-reheat-coil-water-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-213-hvac-domain"
+                "@id": "urn:ex/vav-502-hot-water-in-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-213-occupancy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-502-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-damper-command",
+        "@id": "urn:ex/vav-528-damper-position",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -36028,56 +35989,41 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-214-window-switch-on-off",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-supply-duct-static-pressure-sensor",
+        "@id": "urn:ex/vav-535-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/office-ahu-sa-out"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/office-ahu-supply-duct-static-pressure"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-damper-position",
+        "@id": "urn:ex/zone-307-308-heating-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-damper-in",
+        "@id": "urn:ex/vav-501-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-501-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -36085,172 +36031,217 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-535-air-in"
+                "@id": "urn:ex/vav-501-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-501-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-heating-pid-output",
+        "@id": "urn:ex/zone-112-114-cooling-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-discharge-air-flow",
+        "@id": "urn:ex/office-ahu-oa-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/office-ahu-duct-after-moisture-eliminator"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:ex/office-ahu-oa-flow"
+            },
+            {
+                "@id": "urn:ex/office-ahu-oa-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-529-heating-pid-output",
+        "@id": "urn:ex/room-102-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/room-102-in"
+            },
+            {
+                "@id": "urn:ex/room-102-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-connection-to-vavs",
+        "@id": "urn:ex/vav-516-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Pipe"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-106-107-heating-setpoint",
+        "@id": "urn:ex/vav-537-reheat-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-537-duct-after-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-103-temp-sensor",
+        "@id": "urn:ex/vav-528-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-103-hvac-domain"
+                "@id": "urn:ex/vav-528-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-103-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-528-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-528-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-damper",
+        "@id": "urn:ex/zone-309-310",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-505-damper-in"
+                "@id": "urn:ex/room-309-hvac-domain"
             },
             {
-                "@id": "urn:ex/vav-505-damper-out"
+                "@id": "urn:ex/room-310-hvac-domain"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-505-damper-command"
+                "@id": "urn:ex/zone-309-310-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/vav-505-damper-position"
+                "@id": "urn:ex/zone-309-310-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-309-310-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-309-310-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-309-310-temp"
+            },
+            {
+                "@id": "urn:ex/zone-309-310-window-switch-on-off"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-114",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
+            {
+                "@id": "urn:ex/room-114-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-505-reheat-coil-valve-position",
+        "@id": "urn:ex/vav-513-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:ex/vav-513-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-539-reheat-coil-valve-in",
+        "@id": "urn:ex/vav-519-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-539-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-519-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-501-reheat-coil-air-in",
+        "@id": "urn:ex/vav-531-reheat-coil-air-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-501-duct-after-damper"
+                "@id": "urn:ex/vav-531-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -36260,137 +36251,118 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-208-209-temp-sensor",
+        "@id": "urn:ex/office-ahu-clg-coil-air-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-208-hvac-domain"
+                "@id": "urn:ex/office-ahu-duct-after-htg-coil"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-208-209-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532",
+        "@id": "urn:ex/zone-118-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-532-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-532-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-532-hot-water-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-532-hot-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:ex/vav-532-damper"
-            },
-            {
-                "@id": "urn:ex/vav-532-reheat-coil"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-532-reheat-coil-valve"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-damper-actuator",
+        "@id": "urn:ex/vav-514-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-531-damper"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-531-damper-command"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-105-temp",
+        "@id": "urn:ex/vav-514-reheat-coil-valve-command",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-509",
+        "@id": "urn:ex/vav-524-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-509-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-509-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-509-hot-water-in"
-            },
-            {
-                "@id": "urn:ex/vav-509-hot-water-out"
+                "@id": "urn:ex/vav-524-duct-after-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-509-damper"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-509-reheat-coil"
+                "@id": "urn:ex/vav-524-colder-supply-air-requests"
             },
             {
-                "@id": "urn:ex/vav-509-reheat-coil-valve"
+                "@id": "urn:ex/vav-524-cooling-pid-output"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-110-cooling-setpoint",
+        "@id": "urn:ex/vav-537-heating-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-516-discharge-air-temp",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -36404,467 +36376,463 @@
         ]
     },
     {
-        "@id": "urn:ex/zone-115-temp-sensor",
+        "@id": "urn:ex/zone-116-117",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/room-115-hvac-domain"
+                "@id": "urn:ex/room-116-hvac-domain"
+            },
+            {
+                "@id": "urn:ex/room-117-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/zone-115-temp"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-ea-damper",
-        "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/office-ahu-ea-damper-in"
+                "@id": "urn:ex/zone-116-117-cooling-setpoint"
             },
             {
-                "@id": "urn:ex/office-ahu-ea-damper-out"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:ex/zone-116-117-heating-setpoint"
+            },
             {
-                "@id": "urn:ex/office-ahu-ea-damper-command"
+                "@id": "urn:ex/zone-116-117-occupancy"
             },
             {
-                "@id": "urn:ex/office-ahu-ea-damper-position"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
+                "@id": "urn:ex/zone-116-117-occupancy-override"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Exhaust"
+                "@id": "urn:ex/zone-116-117-temp"
+            },
+            {
+                "@id": "urn:ex/zone-116-117-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-115-occupancy-sensor",
+        "@id": "urn:ex/vav-536-discharge-air-temp-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/room-115-hvac-domain"
+                "@id": "urn:ex/vav-536-air-out"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/zone-115-occupancy"
+                "@id": "urn:ex/vav-536-discharge-air-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-526-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-518-air-in"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-518-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/room-103",
+        "@id": "urn:ex/vav-540-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-103-hvac-domain"
+                "@id": "urn:ex/vav-540-hot-water-out-connection"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:ex/vav-540-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-damper",
+        "@id": "urn:ex/vav-512-cooling-pid-output",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-508-damper-in"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-508-damper-out"
+                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-508-damper-command"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-508-damper-position"
+                "@id": "http://qudt.org/vocab/unit/UNITLESS"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-damper-position",
+        "@id": "urn:ex/vav-504-discharge-air-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
+        "http://data.ashrae.org/standard223#hasAspect": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+            }
+        ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-212-occupancy-override",
+        "@id": "urn:ex/zone-210-occupancy",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-511-duct-after-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-534-reheat-coil-valve"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-534-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-cooling-pid-output",
+        "@id": "urn:ex/vav-519-reheat-coil-valve-position",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/office-ahu-chilled-water-out",
+        "@id": "urn:ex/vav-527-reheat-coil-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-chilled-water-out-connection"
+                "@id": "urn:ex/connection-to-room-301"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-522-reheat-coil-valve-in",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-522-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-527-heating-pid-output"
+            },
+            {
+                "@id": "urn:ex/vav-527-more-heat-requests"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-527-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-damper-actuator",
+        "@id": "urn:ex/zone-115-temp-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-538-damper"
+                "@id": "urn:ex/room-115-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-538-damper-command"
+                "@id": "urn:ex/zone-115-temp"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-discharge-air-temp-sensor",
+        "@id": "urn:ex/zone-106-107-occupancy-sensor",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-514-air-out"
+                "@id": "urn:ex/room-106-hvac-domain"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:ex/vav-514-discharge-air-temp"
+                "@id": "urn:ex/zone-106-107-occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-reheat-coil-air-out",
+        "@id": "urn:ex/vav-510-pipe-hot-water-return-before-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/connection-to-room-202"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-531-discharge-air-flow",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasAspect": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-518-heating-pid-output"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-518-more-heat-requests"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-518-air-out"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-535-reheat-coil-valve-actuator",
+        "@id": "urn:ex/zone-113",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#Zone",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Zone"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:ex/vav-535-reheat-coil-valve"
+                "@id": "urn:ex/room-113-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-535-reheat-coil-valve-command"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/zone-113-cooling-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-113-heating-setpoint"
+            },
+            {
+                "@id": "urn:ex/zone-113-occupancy"
+            },
+            {
+                "@id": "urn:ex/zone-113-occupancy-override"
+            },
+            {
+                "@id": "urn:ex/zone-113-temp"
+            },
+            {
+                "@id": "urn:ex/zone-113-window-switch-on-off"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-heating-pid-output",
+        "@id": "urn:ex/vav-540-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-540-reheat-coil-valve"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/vav-540-reheat-coil-valve-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-511-discharge-air-flow-setpoint",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-517-air-in"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-517-discharge-air-flow"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/connection-to-room-113",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-538-reheat-coil-water-out",
+        "@id": "urn:ex/vav-521-damper-command",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-538-pipe-hot-water-return-before-valve"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-hot-water-out-connection",
+        "@id": "urn:ex/vav-521-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-521-reheat-coil-valve-in"
+            },
+            {
+                "@id": "urn:ex/vav-521-reheat-coil-valve-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/room-113-out",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/office-ahu-connection-from-rooms"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-521-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-521-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-530-reheat-coil",
+        "@id": "urn:ex/zone-206-co2-concentration",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-530-reheat-coil-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-530-reheat-coil-air-out"
-            },
+        "http://data.ashrae.org/standard223#ofSubstance": [
             {
-                "@id": "urn:ex/vav-530-reheat-coil-water-in"
-            },
+                "@id": "http://data.ashrae.org/standard223#Substance-CO2"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-530-reheat-coil-water-out"
+                "@id": "http://qudt.org/vocab/quantitykind/MoleFraction"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://qudt.org/vocab/unit/PPM"
             }
         ]
     },
     {
-        "@id": "urn:ex/connection-to-room-301",
+        "@id": "urn:ex/office-ahu-air-filter",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#AirFilter",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Filter"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/office-ahu-air-filter-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-air-filter-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-116-117-occupancy-override",
+        "@id": "urn:ex/zone-109-window-switch-on-off",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-533-reheat-coil-air-out",
+        "@id": "urn:ex/vav-513-damper-in",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/connection-to-room-305"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:ex/vav-533-heating-pid-output"
-            },
-            {
-                "@id": "urn:ex/vav-533-more-heat-requests"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:ex/vav-533-air-out"
+                "@id": "urn:ex/office-ahu-connection-to-vavs"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/office-ahu-ma-temp",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-513-air-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-202-occupancy-override",
+        "@id": "urn:ex/zone-312-occupancy-override",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -36875,67 +36843,65 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-519-heating-pid-output",
+        "@id": "urn:ex/vav-533-reheat-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#HeatingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterCoil"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-533-reheat-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/vav-533-reheat-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/vav-533-reheat-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/vav-533-reheat-coil-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/zone-112-114-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-515-reheat-coil-air-in",
+        "@id": "urn:ex/vav-538-reheat-coil-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-515-duct-after-damper"
+                "@id": "urn:ex/vav-538-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-525-reheat-coil-valve-actuator",
-        "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
-        ],
-        "http://data.ashrae.org/standard223#actuates": [
-            {
-                "@id": "urn:ex/vav-525-reheat-coil-valve"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-525-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-538-hot-water-in"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-103-heating-setpoint",
+        "@id": "urn:ex/vav-531-discharge-air-temp-setpoint",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -36951,309 +36917,317 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-521-reheat-coil-valve-actuator",
+        "@id": "urn:ex/vav-508-reheat-coil-valve",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#Valve",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#HotWaterValve"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-521-reheat-coil-valve"
-            }
-        ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+                "@id": "urn:ex/vav-508-reheat-coil-valve-in"
+            },
             {
-                "@id": "urn:ex/vav-521-reheat-coil-valve-command"
+                "@id": "urn:ex/vav-508-reheat-coil-valve-out"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/zone-213-heating-setpoint",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Water-HotWater"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-508-reheat-coil-valve-command"
+            },
+            {
+                "@id": "urn:ex/vav-508-reheat-coil-valve-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-damper-out",
+        "@id": "urn:ex/vav-512-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-503-duct-after-damper"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:ex/vav-512-damper-in"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-512-damper-out"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-503-colder-supply-air-requests"
+                "@id": "urn:ex/vav-512-damper-command"
             },
             {
-                "@id": "urn:ex/vav-503-cooling-pid-output"
+                "@id": "urn:ex/vav-512-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-506-discharge-air-flow-sensor",
+        "@id": "urn:ex/zone-214-occupancy",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:ex/vav-506-air-in"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-506-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Occupancy"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-536-discharge-air-temp-sensor",
+        "@id": "urn:ex/vav-506-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/vav-536-air-out"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:ex/vav-536-discharge-air-temp"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-532-cooling-pid-output",
+        "@id": "urn:ex/vav-524-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "urn:ex/vav-524-air-in"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "urn:ex/vav-524-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-damper-actuator",
+        "@id": "urn:ex/vav-505-hot-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-512-damper"
+                "@id": "urn:ex/vav-505-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-512-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-discharge-air-temp",
+        "@id": "urn:ex/office-ahu-clg-coil",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#CoolingCoil",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#ChilledWaterCoil"
         ],
-        "http://data.ashrae.org/standard223#hasAspect": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Discharge"
+                "@id": "urn:ex/office-ahu-clg-coil-air-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-clg-coil-air-out"
+            },
+            {
+                "@id": "urn:ex/office-ahu-clg-coil-water-in"
+            },
+            {
+                "@id": "urn:ex/office-ahu-clg-coil-water-out"
             }
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/room-308",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/room-308-hvac-domain"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-540-heating-pid-output",
+        "@id": "urn:ex/zone-113-temp",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Dimensionless"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/UNITLESS"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-518-discharge-air-temp-sensor",
+        "@id": "urn:ex/room-207-hvac-domain",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-518-air-out"
+                "@id": "urn:ex/room-207-in"
+            },
+            {
+                "@id": "urn:ex/room-207-out"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:ex/vav-518-discharge-air-temp"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-damper-actuator",
+        "@id": "urn:ex/vav-508-reheat-coil-valve-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-507-damper"
+                "@id": "urn:ex/vav-508-hot-water-out-connection"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-507-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
-        ]
-    },
-    {
-        "@id": "urn:ex/vav-539-pipe-hot-water-return-before-valve",
-        "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-508-hot-water-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-528-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-532-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-528-air-in"
+                "@id": "urn:ex/vav-532-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-528-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-517",
+        "@id": "urn:ex/vav-508-reheat-coil-air-out",
         "@type": [
-            "http://data.ashrae.org/standard223#SingleDuctTerminal",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#VAVWithReheat"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-517-air-in"
-            },
-            {
-                "@id": "urn:ex/vav-517-air-out"
-            },
-            {
-                "@id": "urn:ex/vav-517-hot-water-in"
-            },
+                "@id": "urn:ex/connection-to-room-109"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-517-hot-water-out"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-517-damper"
+                "@id": "urn:ex/vav-508-heating-pid-output"
             },
             {
-                "@id": "urn:ex/vav-517-reheat-coil"
-            },
+                "@id": "urn:ex/vav-508-more-heat-requests"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:ex/vav-517-reheat-coil-valve"
+                "@id": "urn:ex/vav-508-air-out"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-air-in",
+        "@id": "urn:ex/vav-518-reheat-coil-valve-position",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-520-reheat-coil-valve-out",
+        "@id": "urn:ex/vav-513-air-out",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-520-hot-water-out-connection"
+                "@id": "urn:ex/connection-to-room-103"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:ex/vav-520-hot-water-out"
+                "@id": "urn:ex/vav-513-discharge-air-flow"
+            },
+            {
+                "@id": "urn:ex/vav-513-discharge-air-flow-setpoint"
+            },
+            {
+                "@id": "urn:ex/vav-513-discharge-air-temp"
+            },
+            {
+                "@id": "urn:ex/vav-513-discharge-air-temp-setpoint"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-discharge-air-flow-sensor",
+        "@id": "urn:ex/vav-540-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-534-air-in"
+                "@id": "urn:ex/vav-540-damper"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-534-discharge-air-flow"
+                "@id": "urn:ex/vav-540-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-508-pipe-hot-water-return-before-valve",
+        "@id": "urn:ex/vav-504-hot-water-out-connection",
         "@type": [
             "http://data.ashrae.org/standard223#Connection",
             "http://data.ashrae.org/standard223#Pipe"
@@ -37265,225 +37239,251 @@
         ]
     },
     {
-        "@id": "urn:ex/vav-528-duct-after-damper",
+        "@id": "urn:ex/vav-502-reheat-coil-valve-in",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:ex/vav-502-pipe-hot-water-return-before-valve"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-203-temp-sensor",
+        "@id": "urn:ex/vav-517-reheat-coil-water-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/room-203-hvac-domain"
+                "@id": "urn:ex/vav-517-pipe-hot-water-return-before-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/zone-203-temp"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-513-duct-after-damper",
+        "@id": "urn:ex/zone-104-window-switch-on-off",
         "@type": [
-            "http://data.ashrae.org/standard223#Connection",
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-OnOff"
             }
         ]
     },
     {
-        "@id": "urn:ex/zone-213-temp",
+        "@id": "urn:ex/vav-527-damper-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:ex/vav-527-damper"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:ex/vav-527-damper-command"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-522-discharge-air-flow-sensor",
+        "@id": "urn:ex/zone-213-occupancy-override",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:ex/vav-522-air-in"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-536-duct-after-damper",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-522-discharge-air-flow"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-531-reheat-coil-air-in",
+        "@id": "urn:ex/vav-540-hot-water-in",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-531-duct-after-damper"
+                "@id": "urn:ex/vav-540-hot-water-in-connection"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-534-discharge-air-temp-setpoint",
+        "@id": "urn:ex/vav-538-hot-water-in-connection",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-510-reheat-coil-water-out",
+        "@id": "urn:ex/vav-537-damper",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Damper",
+            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-510-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/vav-537-damper-in"
+            },
+            {
+                "@id": "urn:ex/vav-537-damper-out"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/vav-537-damper-command"
+            },
+            {
+                "@id": "urn:ex/vav-537-damper-position"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-discharge-air-flow-setpoint",
+        "@id": "urn:ex/vav-533-damper-command",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-514-damper-actuator",
+        "@id": "urn:ex/room-110-out",
         "@type": [
-            "http://data.ashrae.org/standard223#Actuator"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#actuates": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/vav-514-damper"
+                "@id": "urn:ex/office-ahu-connection-from-rooms"
             }
         ],
-        "http://data.ashrae.org/standard223#commandedByProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-514-damper-command"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-507-reheat-coil-air-in",
+        "@id": "urn:ex/vav-504-discharge-air-flow-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-507-duct-after-damper"
+                "@id": "urn:ex/vav-504-air-in"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:ex/vav-504-discharge-air-flow"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-503-damper",
+        "@id": "urn:ex/vav-529-reheat-coil-valve-actuator",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper",
-            "http://data.ashrae.org/standard223/1.0/extensions/g36#Damper"
+            "http://data.ashrae.org/standard223#Actuator"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:ex/vav-503-damper-in"
-            },
+        "http://data.ashrae.org/standard223#actuates": [
             {
-                "@id": "urn:ex/vav-503-damper-out"
+                "@id": "urn:ex/vav-529-reheat-coil-valve"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#commandedByProperty": [
             {
-                "@id": "urn:ex/vav-503-damper-command"
-            },
+                "@id": "urn:ex/vav-529-reheat-coil-valve-command"
+            }
+        ]
+    },
+    {
+        "@id": "urn:ex/vav-505-hot-water-out-connection",
+        "@type": [
+            "http://data.ashrae.org/standard223#Connection",
+            "http://data.ashrae.org/standard223#Pipe"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:ex/vav-503-damper-position"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ]
     },
     {
-        "@id": "urn:ex/vav-512-air-in",
+        "@id": "urn:ex/vav-504-damper-out",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:ex/office-ahu-connection-to-vavs"
+                "@id": "urn:ex/vav-504-duct-after-damper"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:ex/vav-504-colder-supply-air-requests"
+            },
+            {
+                "@id": "urn:ex/vav-504-cooling-pid-output"
+            }
         ]
     },
     {
-        "@id": "urn:ex/vav-504-reheat-coil-valve-in",
+        "@id": "urn:ex/zone-204-205-occupancy-sensor",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:ex/vav-504-pipe-hot-water-return-before-valve"
+                "@id": "urn:ex/room-204-hvac-domain"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:ex/zone-204-205-occupancy"
             }
         ]
     }
diff --git a/nrel-example.jsonld b/nrel-example.jsonld
index cbf1afd8..06b13e9d 100644
--- a/nrel-example.jsonld
+++ b/nrel-example.jsonld
@@ -1,748 +1,902 @@
 [
     {
-        "@id": "urn:nrel_example/nrel00000146",
+        "@id": "urn:nrel_example/nrel00000805",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000805"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001108",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00001108"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000076",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:nrel_example/nrel00001047"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000146"
+                "@value": "nrel00000076"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000044",
+        "@id": "urn:nrel_example/nrel00000094",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000044"
+                "@value": "nrel00000094"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000856",
+        "@id": "urn:nrel_example/nrel00000056",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000045"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000969"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000610"
+                "@value": "nrel00000056"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000174",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000856"
+                "@value": "nrel00000174"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000839",
+        "@id": "urn:nrel_example/nrel00000291",
+        "@type": [
+            "http://data.ashrae.org/standard223#Damper"
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000169"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001009"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000027"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000837"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000291"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000630",
         "@type": [
             "http://data.ashrae.org/standard223#CoolingCoil"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00001092"
+                "@id": "urn:nrel_example/nrel00000707"
             },
             {
-                "@id": "urn:nrel_example/nrel00001115"
+                "@id": "urn:nrel_example/nrel00001195"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000356"
+                "@id": "urn:nrel_example/nrel00000353"
             },
             {
-                "@id": "urn:nrel_example/nrel00000508"
+                "@id": "urn:nrel_example/nrel00000390"
             },
             {
-                "@id": "urn:nrel_example/nrel00001062"
+                "@id": "urn:nrel_example/nrel00001122"
             },
             {
-                "@id": "urn:nrel_example/nrel00001189"
+                "@id": "urn:nrel_example/nrel00001328"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000125"
+                "@id": "urn:nrel_example/nrel00000303"
             },
             {
-                "@id": "urn:nrel_example/nrel00000552"
+                "@id": "urn:nrel_example/nrel00000333"
             },
             {
-                "@id": "urn:nrel_example/nrel00000654"
+                "@id": "urn:nrel_example/nrel00000534"
             },
             {
-                "@id": "urn:nrel_example/nrel00001126"
+                "@id": "urn:nrel_example/nrel00000993"
             },
             {
-                "@id": "urn:nrel_example/nrel00001247"
+                "@id": "urn:nrel_example/nrel00001145"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000839"
+                "@value": "nrel00000630"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001302",
+        "@id": "urn:nrel_example/nrel00000593",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00001302"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000914",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000087"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000434"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@value": "nrel00000914"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000660",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000301"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00001215"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000660"
+                "@value": "nrel00000593"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001071",
+        "@id": "urn:nrel_example/nrel00001059",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000748"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001236"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001071"
+                "@value": "nrel00001059"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000231",
+        "@id": "urn:nrel_example/nrel00000696",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000231"
+                "@value": "nrel00000696"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000861",
+        "@id": "urn:nrel_example/nrel00000471",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000861"
+                "@value": "nrel00000471"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001300",
+        "@id": "urn:nrel_example/nrel00001143",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000512"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001193"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001300"
+                "@value": "nrel00001143"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000770",
+        "@id": "urn:nrel_example/nrel00001142",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000882"
+                "@id": "urn:nrel_example/nrel00000266"
             },
             {
-                "@id": "urn:nrel_example/nrel00001192"
+                "@id": "urn:nrel_example/nrel00000472"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000934"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000143"
-            },
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000244"
+                "@id": "urn:nrel_example/nrel00000104"
             },
             {
-                "@id": "urn:nrel_example/nrel00000276"
+                "@id": "urn:nrel_example/nrel00000620"
             },
             {
-                "@id": "urn:nrel_example/nrel00000311"
+                "@id": "urn:nrel_example/nrel00001141"
             },
             {
-                "@id": "urn:nrel_example/nrel00000624"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000753"
-            },
+                "@id": "urn:nrel_example/nrel00001241"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000943"
+                "@id": "urn:nrel_example/nrel00000256"
             },
             {
-                "@id": "urn:nrel_example/nrel00001035"
-            },
+                "@id": "urn:nrel_example/nrel00000260"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001055"
-            },
+                "@value": "nrel00001142"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000424",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00001309"
-            },
+                "@id": "urn:nrel_example/nrel00000077"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001322"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000770"
+                "@value": "nrel00000424"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000455",
+        "@id": "urn:nrel_example/nrel00001172",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@value": "nrel00001172"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001023",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000455"
+                "@value": "nrel00001023"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000811",
+        "@id": "urn:nrel_example/nrel00000994",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000811"
+                "@value": "nrel00000994"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000744",
+        "@id": "urn:nrel_example/nrel00000368",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000744"
+                "@value": "nrel00000368"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001231",
+        "@id": "urn:nrel_example/nrel00000900",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000366"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000655"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000695"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001271"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001231"
+                "@value": "nrel00000900"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000172",
+        "@id": "urn:nrel_example/nrel00000266",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000351"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001180"
+                "@id": "urn:nrel_example/nrel00000620"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000260"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000172"
+                "@value": "nrel00000266"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000510",
+        "@id": "urn:nrel_example/nrel00001029",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000961"
+                "@id": "urn:nrel_example/nrel00000388"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000475"
+                "@id": "urn:nrel_example/nrel00000673"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000510"
+                "@value": "nrel00001029"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000606",
+        "@id": "urn:nrel_example/nrel00001233",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000606"
+                "@value": "nrel00001233"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001269",
+        "@id": "urn:nrel_example/nrel00001010",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001269"
+                "@value": "nrel00001010"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001125",
+        "@id": "urn:nrel_example/nrel00000604",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00001064"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001259"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:nrel_example/nrel00001136"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000002"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001280"
+                "@id": "urn:nrel_example/nrel00001255"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001125"
+                "@value": "nrel00000604"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000791",
+        "@id": "urn:nrel_example/nrel00001263",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
-            }
+            "http://data.ashrae.org/standard223#Equipment"
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000791"
+                "@value": "nrel00001263"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000763",
+        "@id": "urn:nrel_example/nrel00001157",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000763"
+                "@value": "nrel00001157"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000217",
+        "@id": "urn:nrel_example/nrel00000809",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000161"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000565"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000217"
+                "@value": "nrel00000809"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000310",
+        "@id": "urn:nrel_example/nrel00000328",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+                "@id": "urn:nrel_example/nrel00000306"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001262"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000310"
+                "@value": "nrel00000328"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000236",
+        "@id": "urn:nrel_example/nrel00000600",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000439"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001049"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000847"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001059"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000236"
+                "@value": "nrel00000600"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001080",
+        "@id": "urn:nrel_example/nrel00000922",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001080"
+                "@value": "nrel00000922"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001005",
+        "@id": "urn:nrel_example/nrel00001134",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001005"
+                "@value": "nrel00001134"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001092",
+        "@id": "urn:nrel_example/nrel00000267",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000539"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000763"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000436"
-            },
+                "@value": "nrel00000267"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000579",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001225"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001092"
+                "@value": "nrel00000579"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000333",
+        "@id": "urn:nrel_example/nrel00001028",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000333"
+                "@value": "nrel00001028"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001085",
+        "@id": "urn:nrel_example/nrel00000784",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@value": "nrel00000784"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001291",
+        "@type": [
+            "http://data.ashrae.org/standard223#HeatingCoil"
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:nrel_example/nrel00000421"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000919"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001029"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000026"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000082"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000388"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000785"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000094"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000673"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001085"
+                "@value": "nrel00001291"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001046",
+        "@id": "urn:nrel_example/nrel00000110",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00001036"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001302"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000634"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001137"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001046"
+                "@value": "nrel00000110"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000295",
+        "@id": "urn:nrel_example/nrel00001097",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00001097"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000662",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000295"
+                "@value": "nrel00000662"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000742",
+        "@id": "urn:nrel_example/nrel00000801",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000742"
+                "@value": "nrel00000801"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001204",
+        "@id": "urn:nrel_example/nrel00000552",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -758,515 +912,146 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001204"
+                "@value": "nrel00000552"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001004",
+        "@id": "urn:nrel_example/nrel00001080",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000221"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000336"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000680"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001004"
+                "@value": "nrel00001080"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000273",
+        "@id": "urn:nrel_example/nrel00000450",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000214"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000293"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000920"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000040"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000638"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000720"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001069"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000412"
-            },
+                "@value": "nrel00000450"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000326",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000419"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000273"
+                "@value": "nrel00000326"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000327",
+        "@id": "urn:nrel_example/nrel00001220",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000327"
+                "@value": "nrel00001220"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000300",
+        "@id": "urn:nrel_example/nrel00000574",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00001050"
+                "@id": "urn:nrel_example/nrel00001211"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000518"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000300"
+                "@value": "nrel00000574"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001114",
+        "@id": "urn:nrel_example/nrel00000324",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001086"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000336"
+                "@id": "urn:nrel_example/nrel00000961"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000471"
+                "@id": "urn:nrel_example/nrel00000064"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001114"
+                "@value": "nrel00000324"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000497",
+        "@id": "urn:nrel_example/nrel00000257",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001265"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:nrel_example/nrel00000726"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000497"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001100",
-        "@type": [
-            "http://data.ashrae.org/standard223#HeatExchanger"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000449"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001258"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001263"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000261"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000554"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000577"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001180"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000687"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000885"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001179"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Evaporator"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00001100"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000787",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000080"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000859"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:nrel_example/nrel00000319"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000787"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000447",
-        "@type": [
-            "http://data.ashrae.org/standard223#HeatRecoveryCoil"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000660"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000899"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001166"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001240"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000199"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000542"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000585"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001061"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000447"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001164",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00001164"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001050",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00001050"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000107",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000875"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000107"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000218",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000218"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000490",
-        "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00001020"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001200"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000490"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001154",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00001154"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000073",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000961"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:nrel_example/nrel00000332"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000073"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000050",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000050"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000437",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000437"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000543",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000543"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001262",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00001262"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000666",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000666"
+                "@value": "nrel00000257"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001227",
+        "@id": "urn:nrel_example/nrel00000981",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -1275,249 +1060,56 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001227"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000898",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000898"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000915",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000915"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000806",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000806"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001247",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00001247"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000571",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000571"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000003",
-        "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000804"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001038"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001156"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000612"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000676"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000897"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000953"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000203"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000895"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000003"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000812",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000812"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000192",
-        "@type": [
-            "http://data.ashrae.org/standard223#Valve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000971"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001169"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00001060"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001327"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000192"
+                "@value": "nrel00000981"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000939",
-        "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000281"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000474"
-            }
+        "@id": "urn:nrel_example/nrel00000158",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:nrel_example/nrel00000891"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000308"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001090"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000939"
+                "@value": "nrel00000158"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000287",
+        "@id": "urn:nrel_example/nrel00000903",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000589"
+            }
+        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000287"
+                "@value": "nrel00000903"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000514",
+        "@id": "urn:nrel_example/nrel00001057",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -1526,375 +1118,514 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000514"
+                "@value": "nrel00001057"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000623",
+        "@id": "urn:nrel_example/nrel00000629",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000318"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000393"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000105"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000128"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000218"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000398"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000519"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000528"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000540"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000548"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000702"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001140"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000623"
+                "@value": "nrel00000629"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001079",
+        "@id": "urn:nrel_example/nrel00000747",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000966"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000282"
+                "@id": "urn:nrel_example/nrel00001023"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000109"
+                "@id": "urn:nrel_example/nrel00000710"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001079"
+                "@value": "nrel00000747"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000595",
+        "@id": "urn:nrel_example/nrel00000469",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000595"
+                "@value": "nrel00000469"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000233",
+        "@id": "urn:nrel_example/nrel00001147",
         "@type": [
-            "http://data.ashrae.org/standard223#FanCoilUnit"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00001147"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001100",
+        "@type": [
+            "http://data.ashrae.org/standard223#HeatExchanger"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000226"
+                "@id": "urn:nrel_example/nrel00000449"
             },
             {
-                "@id": "urn:nrel_example/nrel00000568"
+                "@id": "urn:nrel_example/nrel00001258"
             },
             {
-                "@id": "urn:nrel_example/nrel00001291"
+                "@id": "urn:nrel_example/nrel00001263"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000512"
+                "@id": "urn:nrel_example/nrel00000261"
             },
             {
-                "@id": "urn:nrel_example/nrel00001208"
+                "@id": "urn:nrel_example/nrel00000554"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000577"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001180"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000115"
+                "@id": "urn:nrel_example/nrel00000687"
             },
             {
-                "@id": "urn:nrel_example/nrel00000348"
+                "@id": "urn:nrel_example/nrel00000885"
             },
             {
-                "@id": "urn:nrel_example/nrel00000451"
-            },
+                "@id": "urn:nrel_example/nrel00001179"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:nrel_example/nrel00001002"
-            },
+                "@id": "http://data.ashrae.org/standard223#Role-Evaporator"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001212"
+                "@value": "nrel00001100"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000163",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000233"
+                "@value": "nrel00000163"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000414",
+        "@id": "urn:nrel_example/nrel00000055",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Fan"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000207"
+                "@id": "urn:nrel_example/nrel00000079"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000222"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00001163"
+                "@id": "urn:nrel_example/nrel00000016"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000037"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000156"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000195"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000234"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000479"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000922"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001073"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001128"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001173"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001214"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000414"
+                "@value": "nrel00000055"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000267",
+        "@id": "urn:nrel_example/nrel00000023",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000267"
+                "@value": "nrel00000023"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001007",
+        "@id": "urn:nrel_example/nrel00001293",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001007"
+                "@value": "nrel00001293"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001279",
+        "@id": "urn:nrel_example/nrel00000532",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001279"
+                "@value": "nrel00000532"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001283",
+        "@id": "urn:nrel_example/nrel00000487",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001283"
+                "@value": "nrel00000487"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000695",
+        "@id": "urn:nrel_example/nrel00000980",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000695"
+                "@value": "nrel00000980"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001112",
+        "@id": "urn:nrel_example/nrel00000676",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001112"
+                "@value": "nrel00000676"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000487",
+        "@id": "urn:nrel_example/nrel00000591",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000039"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000416"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000604"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000487"
+                "@id": "urn:nrel_example/nrel00000200"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000306"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001136"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001226"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000536",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00000933"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001255"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000536"
+                "@value": "nrel00000591"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000923",
+        "@id": "urn:nrel_example/nrel00000392",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000642"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000067"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000923"
+                "@value": "nrel00000392"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000998",
+        "@id": "urn:nrel_example/nrel00000770",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Fan"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000465"
+                "@id": "urn:nrel_example/nrel00000882"
             },
             {
-                "@id": "urn:nrel_example/nrel00000786"
+                "@id": "urn:nrel_example/nrel00001192"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000143"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000244"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000276"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000311"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000624"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000753"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000943"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001035"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001055"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001309"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001322"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000998"
+                "@value": "nrel00000770"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000052",
+        "@id": "urn:nrel_example/nrel00000710",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000052"
+                "@value": "nrel00000710"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000874",
+        "@id": "urn:nrel_example/nrel00000855",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000874"
+                "@value": "nrel00000855"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000502",
+        "@id": "urn:nrel_example/nrel00000285",
         "@type": [
             "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000846"
+                "@id": "urn:nrel_example/nrel00000059"
             },
             {
-                "@id": "urn:nrel_example/nrel00000948"
+                "@id": "urn:nrel_example/nrel00001161"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -1904,68 +1635,54 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000502"
+                "@value": "nrel00000285"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000207",
+        "@id": "urn:nrel_example/nrel00001315",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "nrel00000207"
+                "@id": "urn:nrel_example/nrel00000441"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000331",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000132"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000331"
+                "@value": "nrel00001315"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000022",
+        "@id": "urn:nrel_example/nrel00000937",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000190"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000366"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000022"
+                "@value": "nrel00000937"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000852",
+        "@id": "urn:nrel_example/nrel00001210",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -1976,12 +1693,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000852"
+                "@value": "nrel00001210"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000523",
+        "@id": "urn:nrel_example/nrel00001132",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -1992,12 +1709,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000523"
+                "@value": "nrel00001132"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000879",
+        "@id": "urn:nrel_example/nrel00001030",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -2008,388 +1725,402 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000879"
+                "@value": "nrel00001030"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000584",
+        "@id": "urn:nrel_example/nrel00000551",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000584"
+                "@value": "nrel00000551"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001184",
+        "@id": "urn:nrel_example/nrel00001040",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001184"
+                "@value": "nrel00001040"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000227",
+        "@id": "urn:nrel_example/nrel00000921",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000227"
+                "@value": "nrel00000921"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001330",
+        "@id": "urn:nrel_example/nrel00000542",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000846"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000121"
+                "@value": "nrel00000542"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001301",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000576"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001330"
+                "@value": "nrel00001301"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000630",
+        "@id": "urn:nrel_example/nrel00000233",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
+            "http://data.ashrae.org/standard223#FanCoilUnit"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000707"
+                "@id": "urn:nrel_example/nrel00000226"
             },
             {
-                "@id": "urn:nrel_example/nrel00001195"
+                "@id": "urn:nrel_example/nrel00000568"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001291"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000353"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000390"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001122"
+                "@id": "urn:nrel_example/nrel00000512"
             },
             {
-                "@id": "urn:nrel_example/nrel00001328"
+                "@id": "urn:nrel_example/nrel00001208"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000303"
+                "@id": "urn:nrel_example/nrel00000115"
             },
             {
-                "@id": "urn:nrel_example/nrel00000333"
+                "@id": "urn:nrel_example/nrel00000348"
             },
             {
-                "@id": "urn:nrel_example/nrel00000534"
+                "@id": "urn:nrel_example/nrel00000451"
             },
             {
-                "@id": "urn:nrel_example/nrel00000993"
+                "@id": "urn:nrel_example/nrel00001002"
             },
             {
-                "@id": "urn:nrel_example/nrel00001145"
+                "@id": "urn:nrel_example/nrel00001212"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+            },
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000630"
+                "@value": "nrel00000233"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000193",
+        "@id": "urn:nrel_example/nrel00000148",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000939"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000708"
+                "@id": "urn:nrel_example/nrel00001046"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000308"
+                "@id": "urn:nrel_example/nrel00001067"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000193"
+                "@value": "nrel00000148"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001273",
+        "@id": "urn:nrel_example/nrel00000680",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001273"
+                "@value": "nrel00000680"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000958",
+        "@id": "urn:nrel_example/nrel00000592",
         "@type": [
-            "http://data.ashrae.org/standard223#TerminalUnit"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000152"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000521"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000591"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000628"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001155"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000208"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000354"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000139"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000823"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000985"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000958"
+                "@value": "nrel00000592"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001303",
+        "@id": "urn:nrel_example/nrel00000170",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000622"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000682"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000286"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000679"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001303"
+                "@value": "nrel00000170"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000002",
+        "@id": "urn:nrel_example/nrel00000053",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Fan"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "urn:nrel_example/nrel00000461"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000931"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "urn:nrel_example/nrel00000012"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000492"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000550"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000562"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000566"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000572"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000607"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000648"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000877"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001075"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001093"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000002"
+                "@value": "nrel00000053"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000565",
+        "@id": "urn:nrel_example/nrel00001008",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:nrel_example/nrel00000092"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000400"
+            },
             {
-                "@value": "nrel00000565"
+                "@id": "urn:nrel_example/nrel00000454"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000239",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "urn:nrel_example/nrel00000017"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000305"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000797"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001144"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "urn:nrel_example/nrel00000275"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000738"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000239"
+                "@value": "nrel00001008"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001238",
+        "@id": "urn:nrel_example/nrel00000744",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001238"
+                "@value": "nrel00000744"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000508",
+        "@id": "urn:nrel_example/nrel00000925",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000441"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000118"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000508"
+                "@value": "nrel00000925"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001001",
+        "@id": "urn:nrel_example/nrel00000060",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001001"
+                "@value": "nrel00000060"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001068",
+        "@id": "urn:nrel_example/nrel00001064",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -2400,28 +2131,28 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001068"
+                "@value": "nrel00001064"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000409",
+        "@id": "urn:nrel_example/nrel00000785",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasDomainSpace": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000966"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000409"
+                "@value": "nrel00000785"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000871",
+        "@id": "urn:nrel_example/nrel00000997",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -2432,86 +2163,124 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000871"
+                "@value": "nrel00000997"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000335",
+        "@id": "urn:nrel_example/nrel00001093",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000335"
+                "@value": "nrel00001093"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000476",
+        "@id": "urn:nrel_example/nrel00000786",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@value": "nrel00000786"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000581",
+        "@type": [
+            "http://data.ashrae.org/standard223#Valve"
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000223"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000320"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000403"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000850"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000476"
+                "@value": "nrel00000581"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000957",
+        "@id": "urn:nrel_example/nrel00001125",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00001064"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001259"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000002"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001280"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000957"
+                "@value": "nrel00001125"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000326",
+        "@id": "urn:nrel_example/nrel00000578",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000326"
+                "@value": "nrel00000578"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000895",
+        "@id": "urn:nrel_example/nrel00000752",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -2527,106 +2296,107 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000895"
+                "@value": "nrel00000752"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000037",
+        "@id": "urn:nrel_example/nrel00001295",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000037"
+                "@value": "nrel00001295"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000989",
+        "@id": "urn:nrel_example/nrel00000005",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasDomainSpace": [
-            {
-                "@id": "urn:nrel_example/nrel00000649"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000818"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000939"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000941"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000989"
+                "@value": "nrel00000005"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000398",
+        "@id": "urn:nrel_example/nrel00000795",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000398"
+                "@value": "nrel00000795"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000953",
+        "@id": "urn:nrel_example/nrel00000014",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000953"
+                "@value": "nrel00000014"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000301",
+        "@id": "urn:nrel_example/nrel00000748",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000301"
+                "@value": "nrel00000748"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000000",
+        "@id": "urn:nrel_example/nrel00000509",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -2637,12 +2407,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000000"
+                "@value": "nrel00000509"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000795",
+        "@id": "urn:nrel_example/nrel00000654",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -2658,72 +2428,35 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000795"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000937",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/A"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000937"
+                "@value": "nrel00000654"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001163",
+        "@id": "urn:nrel_example/nrel00001055",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00001163"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001301",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001301"
+                "@value": "nrel00001055"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000948",
+        "@id": "urn:nrel_example/nrel00000541",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -2732,199 +2465,195 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000948"
+                "@value": "nrel00000541"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000469",
+        "@id": "urn:nrel_example/nrel00000896",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00001049"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@value": "nrel00000469"
+                "@id": "urn:nrel_example/nrel00000114"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000360",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000594"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000360"
+                "@value": "nrel00000896"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000776",
+        "@id": "urn:nrel_example/nrel00000423",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000776"
+                "@value": "nrel00000423"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001118",
+        "@id": "urn:nrel_example/nrel00000193",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+                "@id": "urn:nrel_example/nrel00000939"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "urn:nrel_example/nrel00000708"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000308"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001118"
+                "@value": "nrel00000193"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000853",
+        "@id": "urn:nrel_example/nrel00000176",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000853"
+                "@value": "nrel00000176"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000392",
+        "@id": "urn:nrel_example/nrel00000293",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00001069"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000419"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000392"
+                "@value": "nrel00000293"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000527",
+        "@id": "urn:nrel_example/nrel00000191",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000527"
+                "@value": "nrel00000191"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001110",
+        "@id": "urn:nrel_example/nrel00000444",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001110"
+                "@value": "nrel00000444"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000489",
+        "@id": "urn:nrel_example/nrel00000652",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00001197"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@value": "nrel00000489"
+                "@id": "urn:nrel_example/nrel00001121"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000578",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000499"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000578"
+                "@value": "nrel00000652"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001135",
+        "@id": "urn:nrel_example/nrel00000995",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000131"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001259"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -2933,391 +2662,392 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001135"
+                "@value": "nrel00000995"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001023",
+        "@id": "urn:nrel_example/nrel00000889",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001023"
+                "@value": "nrel00000889"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001178",
+        "@id": "urn:nrel_example/nrel00000702",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001178"
+                "@value": "nrel00000702"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001094",
+        "@id": "urn:nrel_example/nrel00000987",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001094"
+                "@value": "nrel00000987"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000173",
+        "@id": "urn:nrel_example/nrel00001191",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000173"
+                "@value": "nrel00001191"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000338",
+        "@id": "urn:nrel_example/nrel00000536",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000338"
+                "@value": "nrel00000536"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000105",
+        "@id": "urn:nrel_example/nrel00001128",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000105"
+                "@value": "nrel00001128"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000796",
+        "@id": "urn:nrel_example/nrel00001195",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000798"
+            },
             {
-                "@value": "nrel00000796"
+                "@id": "urn:nrel_example/nrel00000888"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000195",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:nrel_example/nrel00000910"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:nrel_example/nrel00001227"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000195"
+                "@value": "nrel00001195"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000769",
+        "@id": "urn:nrel_example/nrel00001099",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000162"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000969"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000054"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000769"
+                "@value": "nrel00001099"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000717",
+        "@id": "urn:nrel_example/nrel00000250",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000122"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001027"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001167"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000717"
+                "@value": "nrel00000250"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000453",
+        "@id": "urn:nrel_example/nrel00000136",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000453"
+                "@value": "nrel00000136"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000362",
+        "@id": "urn:nrel_example/nrel00000533",
         "@type": [
-            "http://data.ashrae.org/standard223#FanCoilUnit"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000830"
+                "@id": "urn:nrel_example/nrel00000188"
             },
             {
-                "@id": "urn:nrel_example/nrel00000839"
+                "@id": "urn:nrel_example/nrel00000418"
             },
             {
-                "@id": "urn:nrel_example/nrel00001176"
+                "@id": "urn:nrel_example/nrel00001012"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000714"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001020"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000527"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000643"
+                "@id": "urn:nrel_example/nrel00000485"
             },
             {
-                "@id": "urn:nrel_example/nrel00000812"
+                "@id": "urn:nrel_example/nrel00000579"
             },
             {
-                "@id": "urn:nrel_example/nrel00001065"
+                "@id": "urn:nrel_example/nrel00001285"
             },
             {
-                "@id": "urn:nrel_example/nrel00001082"
+                "@id": "urn:nrel_example/nrel00001299"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+                "@id": "urn:nrel_example/nrel00000166"
             },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:nrel_example/nrel00000457"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000362"
+                "@value": "nrel00000533"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000771",
+        "@id": "urn:nrel_example/nrel00000848",
         "@type": [
-            "http://data.ashrae.org/standard223#Filter"
+            "http://data.ashrae.org/standard223#CoolingCoil"
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:nrel_example/nrel00000581"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000754"
+            }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000307"
+                "@id": "urn:nrel_example/nrel00000146"
             },
             {
-                "@id": "urn:nrel_example/nrel00000699"
+                "@id": "urn:nrel_example/nrel00000570"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001013"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001323"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000154"
+                "@id": "urn:nrel_example/nrel00000511"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000727"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000774"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001184"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001287"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000771"
+                "@value": "nrel00000848"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001064",
+        "@id": "urn:nrel_example/nrel00000753",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001064"
+                "@value": "nrel00000753"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000451",
+        "@id": "urn:nrel_example/nrel00000243",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000451"
+                "@value": "nrel00000243"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000876",
+        "@id": "urn:nrel_example/nrel00000968",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000876"
+                "@value": "nrel00000968"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001053",
+        "@id": "urn:nrel_example/nrel00000942",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@value": "nrel00000942"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001164",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001053"
+                "@value": "nrel00001164"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001061",
+        "@id": "urn:nrel_example/nrel00000812",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -3333,105 +3063,137 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001061"
+                "@value": "nrel00000812"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000282",
+        "@id": "urn:nrel_example/nrel00000194",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
-        ],
-        "http://data.ashrae.org/standard223#encloses": [
-            {
-                "@id": "urn:nrel_example/nrel00000966"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000091"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000113"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000282"
+                "@value": "nrel00000194"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000344",
+        "@id": "urn:nrel_example/nrel00000235",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#Fan"
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:nrel_example/nrel00000413"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000887"
+            }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000944"
+                "@id": "urn:nrel_example/nrel00001161"
             },
             {
-                "@id": "urn:nrel_example/nrel00001210"
+                "@id": "urn:nrel_example/nrel00001311"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000145"
+                "@id": "urn:nrel_example/nrel00000231"
             },
             {
-                "@id": "urn:nrel_example/nrel00000170"
+                "@id": "urn:nrel_example/nrel00000294"
             },
             {
-                "@id": "urn:nrel_example/nrel00000174"
+                "@id": "urn:nrel_example/nrel00000575"
             },
             {
-                "@id": "urn:nrel_example/nrel00000384"
+                "@id": "urn:nrel_example/nrel00000766"
             },
             {
-                "@id": "urn:nrel_example/nrel00000456"
+                "@id": "urn:nrel_example/nrel00000835"
             },
             {
-                "@id": "urn:nrel_example/nrel00000468"
+                "@id": "urn:nrel_example/nrel00000951"
             },
             {
-                "@id": "urn:nrel_example/nrel00000937"
+                "@id": "urn:nrel_example/nrel00001177"
             },
             {
-                "@id": "urn:nrel_example/nrel00001081"
+                "@id": "urn:nrel_example/nrel00001202"
             },
             {
-                "@id": "urn:nrel_example/nrel00001120"
+                "@id": "urn:nrel_example/nrel00001216"
             },
             {
-                "@id": "urn:nrel_example/nrel00001246"
+                "@id": "urn:nrel_example/nrel00001281"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001332"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000344"
+                "@value": "nrel00000235"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000893",
+        "@id": "urn:nrel_example/nrel00001224",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000893"
+                "@value": "nrel00001224"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000248",
+        "@id": "urn:nrel_example/nrel00000089",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000089"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000605",
+        "@type": [
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000151"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001229"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -3440,14 +3202,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000248"
+                "@value": "nrel00000605"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001123",
+        "@id": "urn:nrel_example/nrel00001007",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -3456,23 +3218,28 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001123"
+                "@value": "nrel00001007"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001294",
+        "@id": "urn:nrel_example/nrel00001031",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001294"
+                "@value": "nrel00001031"
             }
         ]
     },
@@ -3527,9 +3294,30 @@
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000704",
+        "@id": "urn:nrel_example/nrel00000935",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/V"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000935"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000265",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -3538,23 +3326,36 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000704"
+                "@value": "nrel00000265"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001198",
+        "@id": "urn:nrel_example/nrel00000497",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000461"
-            },
+                "@id": "urn:nrel_example/nrel00001265"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001166"
+                "@id": "urn:nrel_example/nrel00000726"
             }
         ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000497"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001182",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
@@ -3562,244 +3363,299 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001198"
+                "@value": "nrel00001182"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000920",
+        "@id": "urn:nrel_example/nrel00000510",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000638"
+                "@id": "urn:nrel_example/nrel00000961"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000412"
+                "@id": "urn:nrel_example/nrel00000475"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000920"
+                "@value": "nrel00000510"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001280",
+        "@id": "urn:nrel_example/nrel00000797",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00001023"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001280"
+                "@value": "nrel00000797"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000909",
+        "@id": "urn:nrel_example/nrel00000838",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000658"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+                "@id": "urn:nrel_example/nrel00000399"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000282"
+                "@id": "urn:nrel_example/nrel00000714"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000091"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000909"
+                "@value": "nrel00000838"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000626",
+        "@id": "urn:nrel_example/nrel00000363",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000004"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000955"
+                "@value": "nrel00000363"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000384",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001030"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001218"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000626"
+                "@value": "nrel00000384"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000188",
+        "@id": "urn:nrel_example/nrel00000097",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000249"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000596"
+                "@value": "nrel00000097"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000457",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000694"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000700"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000188"
+                "@value": "nrel00000457"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000751",
+        "@id": "urn:nrel_example/nrel00000155",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000138"
+                "@id": "urn:nrel_example/nrel00000862"
             }
         ],
         "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000241"
+                "@id": "urn:nrel_example/nrel00000464"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001283"
+                "@id": "urn:nrel_example/nrel00000417"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000751"
+                "@value": "nrel00000155"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000148",
+        "@id": "urn:nrel_example/nrel00000181",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001046"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001067"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000148"
+                "@value": "nrel00000181"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000015",
+        "@id": "urn:nrel_example/nrel00000161",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000015"
+                "@value": "nrel00000161"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000200",
+        "@id": "urn:nrel_example/nrel00000606",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000354"
+                "@value": "nrel00000606"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000103",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000200"
+                "@value": "nrel00000103"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000367",
+        "@id": "urn:nrel_example/nrel00000856",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000219"
+                "@id": "urn:nrel_example/nrel00000045"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000969"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000610"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000856"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001289",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000464"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000956"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000367"
+                "@value": "nrel00001289"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000858",
+        "@id": "urn:nrel_example/nrel00000821",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -3810,346 +3666,382 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000858"
+                "@value": "nrel00000821"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000968",
+        "@id": "urn:nrel_example/nrel00000312",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000869"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001228"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000047"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000196"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000968"
+                "@value": "nrel00000312"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000564",
+        "@id": "urn:nrel_example/nrel00000822",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "urn:nrel_example/nrel00000355"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000438"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000564"
+                "@value": "nrel00000822"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000907",
+        "@id": "urn:nrel_example/nrel00000409",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000043"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000790"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001182"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001242"
-            }
+            "http://data.ashrae.org/standard223#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomainSpace": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000966"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000907"
+                "@value": "nrel00000409"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000154",
+        "@id": "urn:nrel_example/nrel00000828",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "urn:nrel_example/nrel00000251"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "urn:nrel_example/nrel00000121"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000071"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000154"
+                "@value": "nrel00000828"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000993",
+        "@id": "urn:nrel_example/nrel00001251",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000993"
+                "@value": "nrel00001251"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001099",
+        "@id": "urn:nrel_example/nrel00001124",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001099"
+                "@value": "nrel00001124"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001292",
+        "@id": "urn:nrel_example/nrel00000857",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001300"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000147"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001292"
+                "@value": "nrel00000857"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000716",
+        "@id": "urn:nrel_example/nrel00001152",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000716"
+                "@value": "nrel00001152"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000280",
+        "@id": "urn:nrel_example/nrel00001308",
         "@type": [
-            "http://data.ashrae.org/standard223#FanCoilUnit"
+            "http://data.ashrae.org/standard223#Fan"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000003"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000055"
+                "@id": "urn:nrel_example/nrel00000291"
             },
             {
-                "@id": "urn:nrel_example/nrel00000848"
+                "@id": "urn:nrel_example/nrel00000496"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000278"
+                "@id": "urn:nrel_example/nrel00000970"
             },
             {
-                "@id": "urn:nrel_example/nrel00001157"
+                "@id": "urn:nrel_example/nrel00001207"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000988"
+                "@id": "urn:nrel_example/nrel00000283"
             },
             {
-                "@id": "urn:nrel_example/nrel00001152"
+                "@id": "urn:nrel_example/nrel00000651"
             },
             {
-                "@id": "urn:nrel_example/nrel00001204"
+                "@id": "urn:nrel_example/nrel00000661"
             },
             {
-                "@id": "urn:nrel_example/nrel00001244"
+                "@id": "urn:nrel_example/nrel00000674"
             },
             {
-                "@id": "urn:nrel_example/nrel00001282"
+                "@id": "urn:nrel_example/nrel00000811"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000963"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001016"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001132"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001272"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001273"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001331"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+                "@value": "nrel00001308"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000733",
+        "@type": [
+            "http://data.ashrae.org/standard223#Valve"
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000949"
             },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:nrel_example/nrel00001057"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000357"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001017"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000280"
+                "@value": "nrel00000733"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000051",
+        "@id": "urn:nrel_example/nrel00000210",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000051"
+                "@value": "nrel00000210"
             }
         ]
     },
     {
-        "@id": "http://data.ashrae.org/standard223#EnumerationKind-Default",
+        "@id": "urn:nrel_example/nrel00000004",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus",
-            "http://data.ashrae.org/standard223#EnumerationKind-Override"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@language": "en",
-                "@value": "AlarmStatus-Alarm"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@language": "en",
-                "@value": "Override-Default"
+                "@value": "nrel00000004"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000169",
+        "@id": "urn:nrel_example/nrel00000282",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
+            {
+                "@id": "urn:nrel_example/nrel00000966"
+            }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000091"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000113"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000169"
+                "@value": "nrel00000282"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000849",
+        "@id": "urn:nrel_example/nrel00000735",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000948"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000048"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000849"
+                "@value": "nrel00000735"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001214",
+        "@id": "urn:nrel_example/nrel00001163",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001214"
+                "@value": "nrel00001163"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000925",
+        "@id": "urn:nrel_example/nrel00000020",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000441"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000118"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000925"
+                "@value": "nrel00000020"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001018",
+        "@id": "urn:nrel_example/nrel00000167",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -4160,54 +4052,49 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001018"
+                "@value": "nrel00000167"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000930",
+        "@id": "urn:nrel_example/nrel00000910",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000930"
+                "@value": "nrel00000910"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000013",
+        "@id": "urn:nrel_example/nrel00000560",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000013"
+                "@value": "nrel00000560"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000046",
+        "@id": "urn:nrel_example/nrel00000711",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -4223,90 +4110,51 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000046"
+                "@value": "nrel00000711"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001014",
+        "@id": "urn:nrel_example/nrel00000473",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001014"
+                "@value": "nrel00000473"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000187",
+        "@id": "urn:nrel_example/nrel00000817",
         "@type": [
-            "http://data.ashrae.org/standard223#TerminalUnit"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000205"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000273"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000369"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000925"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001315"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000441"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001047"
+                "@id": "urn:nrel_example/nrel00001072"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000118"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000132"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000758"
+                "@id": "urn:nrel_example/nrel00000684"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000187"
+                "@value": "nrel00000817"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000077",
+        "@id": "urn:nrel_example/nrel00001063",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000424"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000892"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -4315,87 +4163,65 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000077"
+                "@value": "nrel00001063"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000568",
+        "@id": "urn:nrel_example/nrel00000779",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000898"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001051"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000197"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000292"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000402"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000636"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000697"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000832"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000945"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000981"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001058"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001106"
-            },
+                "@value": "nrel00000779"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001268",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001201"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000568"
+                "@value": "nrel00001268"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000283",
+        "@id": "urn:nrel_example/nrel00000086",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000283"
+                "@value": "nrel00000086"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001067",
+        "@id": "urn:nrel_example/nrel00000740",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -4411,296 +4237,239 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001067"
+                "@value": "nrel00000740"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001019",
+        "@id": "urn:nrel_example/nrel00001314",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001019"
+                "@value": "nrel00001314"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001211",
+        "@id": "urn:nrel_example/nrel00000657",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000406"
+                "@id": "urn:nrel_example/nrel00000779"
             },
             {
-                "@id": "urn:nrel_example/nrel00000574"
+                "@id": "urn:nrel_example/nrel00000912"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000767"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001133"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001211"
+                "@value": "nrel00000657"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001134",
+        "@id": "urn:nrel_example/nrel00000472",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "urn:nrel_example/nrel00001241"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "urn:nrel_example/nrel00000256"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001134"
+                "@value": "nrel00000472"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000949",
+        "@id": "urn:nrel_example/nrel00000775",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000949"
+                "@value": "nrel00000775"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000505",
+        "@id": "urn:nrel_example/nrel00000334",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000626"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001071"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001266"
+                "@id": "urn:nrel_example/nrel00000587"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000321"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000748"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000983"
-            },
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001117"
+                "@id": "urn:nrel_example/nrel00000160"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000936"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001236"
+                "@id": "urn:nrel_example/nrel00000433"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000505"
+                "@value": "nrel00000334"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000441",
+        "@id": "urn:nrel_example/nrel00000888",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000441"
+                "@value": "nrel00000888"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001216",
+        "@id": "urn:nrel_example/nrel00000164",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001216"
+                "@value": "nrel00000164"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001236",
+        "@id": "urn:nrel_example/nrel00000945",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001236"
+                "@value": "nrel00000945"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000783",
+        "@id": "urn:nrel_example/nrel00000616",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000970"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000984"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000783"
+                "@value": "nrel00000616"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000350",
+        "@id": "urn:nrel_example/nrel00001280",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000986"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000160"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000225"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000350"
+                "@value": "nrel00001280"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001055",
+        "@id": "urn:nrel_example/nrel00000761",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001055"
+                "@value": "nrel00000761"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000581",
+        "@id": "urn:nrel_example/nrel00000807",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000223"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000320"
-            }
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000403"
+                "@id": "urn:nrel_example/nrel00000045"
             },
             {
-                "@id": "urn:nrel_example/nrel00000850"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000581"
+                "@id": "urn:nrel_example/nrel00001157"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000297",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -4709,197 +4478,149 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000297"
+                "@value": "nrel00000807"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001264",
+        "@id": "urn:nrel_example/nrel00000633",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001264"
+                "@value": "nrel00000633"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000561",
+        "@id": "urn:nrel_example/nrel00000492",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000448"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000921"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000106"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001054"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000561"
+                "@value": "nrel00000492"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000358",
+        "@id": "urn:nrel_example/nrel00000369",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000441"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000758"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000358"
+                "@value": "nrel00000369"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000569",
+        "@id": "urn:nrel_example/nrel00000420",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000569"
+                "@value": "nrel00000420"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001266",
+        "@id": "urn:nrel_example/nrel00001036",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000321"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00000936"
+                "@id": "urn:nrel_example/nrel00000462"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001266"
+                "@value": "nrel00001036"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000373",
+        "@id": "urn:nrel_example/nrel00000743",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000373"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000981",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000981"
+                "@value": "nrel00000743"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000486",
+        "@id": "urn:nrel_example/nrel00000501",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001125"
+                "@id": "urn:nrel_example/nrel00000236"
             }
         ],
         "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000500"
+                "@id": "urn:nrel_example/nrel00001165"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001280"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000486"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001248",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000567"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001248"
+                "@value": "nrel00000501"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000354",
+        "@id": "urn:nrel_example/nrel00001284",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -4908,126 +4629,120 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:nrel_example/nrel00000961"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000354"
+                "@value": "nrel00001284"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001013",
+        "@id": "urn:nrel_example/nrel00000774",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001013"
+                "@value": "nrel00000774"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000439",
+        "@id": "urn:nrel_example/nrel00000874",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000439"
+                "@value": "nrel00000874"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000496",
+        "@id": "urn:nrel_example/nrel00000485",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000970"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001272"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000496"
+                "@value": "nrel00000485"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000583",
+        "@id": "urn:nrel_example/nrel00000523",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000583"
+                "@value": "nrel00000523"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000422",
+        "@id": "urn:nrel_example/nrel00001047",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000422"
+                "@value": "nrel00001047"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000123",
+        "@id": "urn:nrel_example/nrel00000037",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000290"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001091"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000440"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000689"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000123"
+                "@value": "nrel00000037"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000912",
+        "@id": "urn:nrel_example/nrel00001062",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -5038,114 +4753,76 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000912"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000831",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000831"
+                "@value": "nrel00001062"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000857",
+        "@id": "urn:nrel_example/nrel00001127",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000857"
+                "@value": "nrel00001127"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000308",
+        "@id": "urn:nrel_example/nrel00000329",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000308"
+                "@value": "nrel00000329"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001089",
+        "@id": "urn:nrel_example/nrel00001015",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatRecoveryCoil"
+            "http://data.ashrae.org/standard223#Valve"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000351"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000618"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000821"
+                "@id": "urn:nrel_example/nrel00000487"
             },
             {
-                "@id": "urn:nrel_example/nrel00001304"
+                "@id": "urn:nrel_example/nrel00001099"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000315"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000368"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000431"
+                "@id": "urn:nrel_example/nrel00000024"
             },
             {
-                "@id": "urn:nrel_example/nrel00000488"
+                "@id": "urn:nrel_example/nrel00000979"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001089"
+                "@value": "nrel00001015"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000047",
+        "@id": "urn:nrel_example/nrel00001248",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -5156,49 +4833,49 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000047"
+                "@value": "nrel00001248"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000709",
+        "@id": "urn:nrel_example/nrel00001037",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:nrel_example/nrel00000722"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:nrel_example/nrel00000820"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000709"
+                "@value": "nrel00001037"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000910",
+        "@id": "urn:nrel_example/nrel00000220",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000910"
+                "@value": "nrel00000220"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000221",
+        "@id": "urn:nrel_example/nrel00000588",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -5209,142 +4886,147 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000221"
+                "@value": "nrel00000588"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001206",
+        "@id": "urn:nrel_example/nrel00000544",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001206"
+                "@value": "nrel00000544"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000969",
+        "@id": "urn:nrel_example/nrel00000845",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000736"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000054"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000610"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000969"
+                "@value": "nrel00000845"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001230",
+        "@id": "urn:nrel_example/nrel00000760",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000760"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000043",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001230"
+                "@value": "nrel00000043"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000722",
+        "@id": "urn:nrel_example/nrel00001250",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000722"
+                "@value": "nrel00001250"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000755",
+        "@id": "urn:nrel_example/nrel00001077",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000380"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000491"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000473"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00000883"
+                "@id": "urn:nrel_example/nrel00000134"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000755"
+                "@value": "nrel00001077"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000582",
+        "@id": "urn:nrel_example/nrel00000088",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00001040"
+                "@id": "urn:nrel_example/nrel00000986"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001194"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000571"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000582"
+                "@value": "nrel00000088"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001215",
+        "@id": "urn:nrel_example/nrel00000108",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -5355,14 +5037,22 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001215"
+                "@value": "nrel00000108"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001183",
+        "@id": "urn:nrel_example/nrel00000759",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000025"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000040"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -5371,207 +5061,240 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001183"
+                "@value": "nrel00000759"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000774",
+        "@id": "urn:nrel_example/nrel00000506",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000774"
+                "@value": "nrel00000506"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000829",
+        "@id": "urn:nrel_example/nrel00000879",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000600"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000114"
+                "@value": "nrel00000879"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000684",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000847"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000829"
+                "@value": "nrel00000684"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000901",
+        "@id": "urn:nrel_example/nrel00001019",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000901"
+                "@value": "nrel00001019"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000756",
+        "@id": "urn:nrel_example/nrel00000095",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#TerminalUnit"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000168"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000312"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000497"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000608"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000799"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000756"
+                "@id": "urn:nrel_example/nrel00000227"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001265"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000167",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000042"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000726"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000809"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000167"
+                "@value": "nrel00000095"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000320",
+        "@id": "urn:nrel_example/nrel00000611",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000590"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@value": "nrel00000320"
+                "@id": "urn:nrel_example/nrel00001121"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000635",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000009"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000635"
+                "@value": "nrel00000611"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000429",
+        "@id": "urn:nrel_example/nrel00001307",
         "@type": [
-            "http://data.ashrae.org/standard223#Filter"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000158"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000940"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000250"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000429"
+                "@value": "nrel00001307"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000788",
+        "@id": "urn:nrel_example/nrel00000514",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000788"
+                "@value": "nrel00000514"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000854",
+        "@id": "urn:nrel_example/nrel00000715",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000781"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001027"
+                "@value": "nrel00000715"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001166",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000537"
+                "@id": "urn:nrel_example/nrel00001198"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000854"
+                "@value": "nrel00001166"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000386",
+        "@id": "urn:nrel_example/nrel00000944",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -5580,14 +5303,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000386"
+                "@value": "nrel00000944"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000590",
+        "@id": "urn:nrel_example/nrel00000441",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -5596,176 +5319,201 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000590"
+                "@value": "nrel00000441"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000364",
+        "@id": "urn:nrel_example/nrel00000287",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000364"
+                "@value": "nrel00000287"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001307",
+        "@id": "urn:nrel_example/nrel00000029",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001307"
+                "@value": "nrel00000029"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001030",
+        "@id": "urn:nrel_example/nrel00001266",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000321"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000936"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001030"
+                "@value": "nrel00001266"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001331",
+        "@id": "urn:nrel_example/nrel00000134",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001331"
+                "@value": "nrel00000134"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000199",
+        "@id": "urn:nrel_example/nrel00000520",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000199"
+                "@value": "nrel00000520"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001108",
+        "@id": "urn:nrel_example/nrel00000198",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000198"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001046",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001108"
+                "@value": "nrel00001046"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000886",
+        "@id": "urn:nrel_example/nrel00001145",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000886"
+                "@value": "nrel00001145"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001022",
+        "@id": "urn:nrel_example/nrel00000979",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001022"
+                "@value": "nrel00000979"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001182",
+        "@id": "urn:nrel_example/nrel00000989",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Zone"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomainSpace": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000649"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000818"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000939"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000941"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001182"
+                "@value": "nrel00000989"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000705",
+        "@id": "urn:nrel_example/nrel00001051",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -5776,176 +5524,136 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000705"
+                "@value": "nrel00001051"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001220",
+        "@id": "urn:nrel_example/nrel00000717",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000122"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00001027"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00001167"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001220"
+                "@value": "nrel00000717"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000210",
+        "@id": "urn:nrel_example/nrel00001006",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000210"
+                "@value": "nrel00001006"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000810",
+        "@id": "urn:nrel_example/nrel00001102",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000810"
+                "@value": "nrel00001102"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000370",
+        "@id": "urn:nrel_example/nrel00000327",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000370"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000473",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000473"
+                "@value": "nrel00000327"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000270",
+        "@id": "urn:nrel_example/nrel00000808",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000270"
+                "@value": "nrel00000808"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000707",
+        "@id": "urn:nrel_example/nrel00000123",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#Valve"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000735"
+                "@id": "urn:nrel_example/nrel00000290"
             },
             {
-                "@id": "urn:nrel_example/nrel00001172"
+                "@id": "urn:nrel_example/nrel00001091"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000086"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000089"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000129"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000326"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000513"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000659"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000728"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001098"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001110"
+                "@id": "urn:nrel_example/nrel00000440"
             },
             {
-                "@id": "urn:nrel_example/nrel00001237"
+                "@id": "urn:nrel_example/nrel00000689"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000707"
+                "@value": "nrel00000123"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001319",
+        "@id": "urn:nrel_example/nrel00000360",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -5954,75 +5662,81 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001319"
+                "@value": "nrel00000360"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000225",
+        "@id": "urn:nrel_example/nrel00000834",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000834"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000422",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000225"
+                "@value": "nrel00000422"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000375",
+        "@id": "urn:nrel_example/nrel00000962",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000375"
+                "@value": "nrel00000962"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000101",
+        "@id": "urn:nrel_example/nrel00000140",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000736"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000969"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001014"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000101"
+                "@value": "nrel00000140"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000633",
+        "@id": "urn:nrel_example/nrel00000277",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -6033,12 +5747,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000633"
+                "@value": "nrel00000277"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000034",
+        "@id": "urn:nrel_example/nrel00000575",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -6054,178 +5768,97 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000034"
+                "@value": "nrel00000575"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000618",
+        "@id": "urn:nrel_example/nrel00000075",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000517"
-            }
-        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000618"
+                "@value": "nrel00000075"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000475",
+        "@id": "urn:nrel_example/nrel00000455",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000475"
+                "@value": "nrel00000455"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001282",
+        "@id": "urn:nrel_example/nrel00001060",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001282"
+                "@value": "nrel00001060"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000053",
+        "@id": "urn:nrel_example/nrel00000339",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000461"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000931"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000012"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000492"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000550"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000562"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000566"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000572"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000607"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000648"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000877"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001075"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001093"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000053"
+                "@value": "nrel00000339"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000099",
+        "@id": "urn:nrel_example/nrel00000572",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000297"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000541"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000036"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000181"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000210"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000259"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000304"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000375"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000609"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000690"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000744"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000954"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001147"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000099"
+                "@value": "nrel00000572"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001306",
+        "@id": "urn:nrel_example/nrel00000946",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -6241,198 +5874,226 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001306"
+                "@value": "nrel00000946"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001062",
+        "@id": "urn:nrel_example/nrel00001204",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001062"
+                "@value": "nrel00001204"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000528",
+        "@id": "urn:nrel_example/nrel00000650",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000528"
+                "@value": "nrel00000650"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000982",
+        "@id": "urn:nrel_example/nrel00001303",
         "@type": [
-            "http://data.ashrae.org/standard223#AirHandlingUnit"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000007"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000053"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000061"
-            },
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000254"
+                "@id": "urn:nrel_example/nrel00000622"
             },
             {
-                "@id": "urn:nrel_example/nrel00000446"
-            },
+                "@id": "urn:nrel_example/nrel00000682"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000447"
+                "@id": "urn:nrel_example/nrel00000286"
             },
             {
-                "@id": "urn:nrel_example/nrel00000683"
-            },
+                "@id": "urn:nrel_example/nrel00000679"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000992"
-            },
+                "@value": "nrel00001303"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000573",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001087"
+                "@id": "urn:nrel_example/nrel00000941"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000078"
-            },
+                "@id": "urn:nrel_example/nrel00000121"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000211"
+                "@id": "urn:nrel_example/nrel00000404"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000034"
-            },
+                "@value": "nrel00000573"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000321",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001070"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000982"
+                "@value": "nrel00000321"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000906",
+        "@id": "urn:nrel_example/nrel00000639",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000827"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000852"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000422"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000855"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000906"
+                "@value": "nrel00000639"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001244",
+        "@id": "urn:nrel_example/nrel00000375",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001244"
+                "@value": "nrel00000375"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000214",
+        "@id": "urn:nrel_example/nrel00000914",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000408"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000526"
+                "@value": "nrel00000914"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000294",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000395"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001170"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000214"
+                "@value": "nrel00000294"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001120",
+        "@id": "urn:nrel_example/nrel00000122",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+                "@id": "urn:nrel_example/nrel00000074"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000781"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000335"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001167"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001120"
+                "@value": "nrel00000122"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000658",
+        "@id": "urn:nrel_example/nrel00000792",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -6441,12 +6102,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000658"
+                "@value": "nrel00000792"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000999",
+        "@id": "urn:nrel_example/nrel00001317",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -6462,204 +6123,175 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000999"
+                "@value": "nrel00001317"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000347",
+        "@id": "urn:nrel_example/nrel00000477",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000347"
+                "@value": "nrel00000477"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000449",
+        "@id": "urn:nrel_example/nrel00000019",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000784"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001129"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000224"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000387"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000458"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000664"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000692"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000750"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000871"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001222"
-            },
+                "@value": "nrel00000019"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000555",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001289"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001326"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000449"
+                "@value": "nrel00000555"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000723",
+        "@id": "urn:nrel_example/nrel00000695",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000723"
+                "@value": "nrel00000695"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001255",
+        "@id": "urn:nrel_example/nrel00000246",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000649"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000553"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000182"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001255"
+                "@value": "nrel00000246"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000697",
+        "@id": "urn:nrel_example/nrel00000074",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000697"
+                "@value": "nrel00000074"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000112",
+        "@id": "urn:nrel_example/nrel00000571",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000407"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000621"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000316"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000455"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000506"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000536"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000583"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000666"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000721"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000764"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000851"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001103"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000112"
+                "@value": "nrel00000571"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001265",
+        "@id": "urn:nrel_example/nrel00000378",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000220"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000859"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000284"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001265"
+                "@value": "nrel00000378"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000679",
+        "@id": "urn:nrel_example/nrel00000952",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -6670,135 +6302,156 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000679"
+                "@value": "nrel00000952"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000610",
+        "@id": "urn:nrel_example/nrel00000890",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000610"
+                "@value": "nrel00000890"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000824",
+        "@id": "urn:nrel_example/nrel00000661",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000386"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000532"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000410"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001248"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000824"
+                "@value": "nrel00000661"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000729",
+        "@id": "urn:nrel_example/nrel00000132",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000018"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000619"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000023"
-            },
+                "@value": "nrel00000132"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000084",
+        "@type": [
+            "http://data.ashrae.org/standard223#HeatingCoil"
+        ],
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000060"
+                "@id": "urn:nrel_example/nrel00000133"
             },
             {
-                "@id": "urn:nrel_example/nrel00000201"
+                "@id": "urn:nrel_example/nrel00000593"
             },
             {
-                "@id": "urn:nrel_example/nrel00000232"
-            },
+                "@id": "urn:nrel_example/nrel00000772"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000614"
+                "@id": "urn:nrel_example/nrel00000151"
             },
             {
-                "@id": "urn:nrel_example/nrel00000843"
+                "@id": "urn:nrel_example/nrel00000167"
             },
             {
-                "@id": "urn:nrel_example/nrel00000878"
+                "@id": "urn:nrel_example/nrel00000432"
             },
             {
-                "@id": "urn:nrel_example/nrel00000886"
-            },
+                "@id": "urn:nrel_example/nrel00000991"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000926"
+                "@id": "urn:nrel_example/nrel00000978"
             },
             {
-                "@id": "urn:nrel_example/nrel00001083"
-            },
+                "@id": "urn:nrel_example/nrel00001235"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001146"
+                "@value": "nrel00000084"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000964",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000729"
+                "@value": "nrel00000964"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000576",
+        "@id": "urn:nrel_example/nrel00000988",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000576"
+                "@value": "nrel00000988"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000132",
+        "@id": "urn:nrel_example/nrel00000216",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -6814,193 +6467,252 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000132"
+                "@value": "nrel00000216"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000006",
+        "@id": "urn:nrel_example/nrel00000876",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000006"
+                "@value": "nrel00000876"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000880",
+        "@id": "urn:nrel_example/nrel00000166",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000880"
+                "@value": "nrel00000166"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000256",
+        "@id": "urn:nrel_example/nrel00001276",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#FanCoilUnit"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000757"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000777"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001142"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000100"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000873"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000141"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000382"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000711"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000765"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000959"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+            },
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000256"
+                "@value": "nrel00001276"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001209",
+        "@id": "urn:nrel_example/nrel00000062",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000514"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000913"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000601"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000793"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001209"
+                "@value": "nrel00000062"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000832",
+        "@id": "urn:nrel_example/nrel00000725",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "urn:nrel_example/nrel00000441"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000590"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000832"
+                "@value": "nrel00000725"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000676",
+        "@id": "urn:nrel_example/nrel00000833",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000074"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00001027"
+            }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000206"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000676"
+                "@value": "nrel00000833"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000380",
+        "@id": "urn:nrel_example/nrel00000655",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:nrel_example/nrel00000688"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000380"
+                "@value": "nrel00000655"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000208",
+        "@id": "urn:nrel_example/nrel00001243",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000281"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@value": "nrel00000208"
+                "@id": "urn:nrel_example/nrel00000708"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000761",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
+                "@id": "urn:nrel_example/nrel00000866"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000761"
+                "@value": "nrel00001243"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001156",
+        "@id": "urn:nrel_example/nrel00000708",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000198"
-            },
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:nrel_example/nrel00000578"
+                "@id": "urn:nrel_example/nrel00000939"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000788"
+                "@id": "urn:nrel_example/nrel00000345"
             },
             {
-                "@id": "urn:nrel_example/nrel00001006"
+                "@id": "urn:nrel_example/nrel00000866"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001156"
+                "@value": "nrel00000708"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000792",
+        "@id": "urn:nrel_example/nrel00000745",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -7011,119 +6723,91 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000792"
+                "@value": "nrel00000745"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000985",
+        "@id": "urn:nrel_example/nrel00000886",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000985"
+                "@value": "nrel00000886"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000484",
+        "@id": "urn:nrel_example/nrel00001001",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000059"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000282"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000113"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000484"
+                "@value": "nrel00001001"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000135",
+        "@id": "urn:nrel_example/nrel00001200",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000340"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000734"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000906"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000051"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000075"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000914"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001250"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000202"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000740"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000135"
+                "@value": "nrel00001200"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000928",
+        "@id": "urn:nrel_example/nrel00001257",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000928"
+                "@value": "nrel00001257"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000873",
+        "@id": "urn:nrel_example/nrel00001111",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -7134,28 +6818,28 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000873"
+                "@value": "nrel00001111"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001091",
+        "@id": "urn:nrel_example/nrel00000590",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001091"
+                "@value": "nrel00000590"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001076",
+        "@id": "urn:nrel_example/nrel00000301",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -7166,51 +6850,67 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001076"
+                "@value": "nrel00000301"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000202",
+        "@id": "urn:nrel_example/nrel00000827",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@value": "nrel00000827"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000000",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000202"
+                "@value": "nrel00000000"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000075",
+        "@id": "urn:nrel_example/nrel00000609",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000075"
+                "@value": "nrel00000609"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000194",
+        "@id": "urn:nrel_example/nrel00000106",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -7219,108 +6919,96 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000194"
+                "@value": "nrel00000106"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000830",
+        "@id": "urn:nrel_example/nrel00000039",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000252"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001159"
+                "@id": "urn:nrel_example/nrel00001226"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000238"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000359"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000427"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000645"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000791"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000861"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000880"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000977"
-            },
+                "@id": "urn:nrel_example/nrel00000933"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001019"
-            },
+                "@value": "nrel00000039"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000720",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001048"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00001217"
+                "@id": "urn:nrel_example/nrel00000441"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000830"
+                "@value": "nrel00000720"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000041",
+        "@id": "urn:nrel_example/nrel00000105",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000041"
+                "@value": "nrel00000105"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000352",
+        "@id": "urn:nrel_example/nrel00000041",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000352"
+                "@value": "nrel00000041"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000511",
+        "@id": "urn:nrel_example/nrel00001002",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -7336,56 +7024,56 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000511"
+                "@value": "nrel00001002"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000206",
+        "@id": "urn:nrel_example/nrel00000524",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:nrel_example/nrel00000967"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:nrel_example/nrel00000865"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000206"
+                "@value": "nrel00000524"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000616",
+        "@id": "urn:nrel_example/nrel00001175",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000616"
+                "@value": "nrel00001175"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000019",
+        "@id": "urn:nrel_example/nrel00000763",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -7394,215 +7082,291 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000019"
+                "@value": "nrel00000763"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000241",
+        "@id": "urn:nrel_example/nrel00000449",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000631"
+                "@id": "urn:nrel_example/nrel00000784"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001129"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000274"
+                "@id": "urn:nrel_example/nrel00000224"
             },
             {
-                "@id": "urn:nrel_example/nrel00001283"
+                "@id": "urn:nrel_example/nrel00000387"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000458"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000664"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000692"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000750"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000871"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001222"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001289"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001326"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000241"
+                "@value": "nrel00000449"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000038",
+        "@id": "urn:nrel_example/nrel00000682",
         "@type": [
-            "http://data.ashrae.org/standard223#FanCoilUnit"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000495"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000780"
-            },
+                "@value": "nrel00000682"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000928",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001187"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000420"
-            },
+                "@value": "nrel00000928"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000186",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001270"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000173"
-            },
+                "@value": "nrel00000186"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001042",
+        "@type": [
+            "http://data.ashrae.org/standard223#Valve"
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000212"
+                "@id": "urn:nrel_example/nrel00000530"
             },
             {
-                "@id": "urn:nrel_example/nrel00000228"
-            },
+                "@id": "urn:nrel_example/nrel00000834"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000329"
+                "@id": "urn:nrel_example/nrel00000606"
             },
             {
-                "@id": "urn:nrel_example/nrel00000884"
+                "@id": "urn:nrel_example/nrel00001124"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
-            },
+                "@value": "nrel00001042"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000719",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000038"
+                "@value": "nrel00000719"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001149",
+        "@id": "urn:nrel_example/nrel00000927",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:nrel_example/nrel00000742"
-            }
-        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001149"
+                "@value": "nrel00000927"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000246",
+        "@id": "urn:nrel_example/nrel00000350",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000649"
+                "@id": "urn:nrel_example/nrel00000986"
             }
         ],
         "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000553"
+                "@id": "urn:nrel_example/nrel00000160"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000182"
+                "@id": "urn:nrel_example/nrel00000225"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000246"
+                "@value": "nrel00000350"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000452",
+        "@id": "urn:nrel_example/nrel00000898",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000452"
+                "@value": "nrel00000898"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000708",
+        "@id": "urn:nrel_example/nrel00000343",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000939"
+                "@id": "urn:nrel_example/nrel00000134"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000345"
-            },
+                "@id": "urn:nrel_example/nrel00000669"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000866"
+                "@value": "nrel00000343"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000018",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000708"
+                "@value": "nrel00000018"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001275",
+        "@id": "urn:nrel_example/nrel00001192",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001275"
+                "@value": "nrel00001192"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000292",
+        "@id": "urn:nrel_example/nrel00000648",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000292"
+                "@value": "nrel00000648"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000809",
+        "@id": "urn:nrel_example/nrel00000431",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -7618,56 +7382,67 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000809"
+                "@value": "nrel00000431"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000706",
+        "@id": "urn:nrel_example/nrel00001161",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@value": "nrel00001161"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001237",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000706"
+                "@value": "nrel00001237"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000645",
+        "@id": "urn:nrel_example/nrel00000687",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000645"
+                "@value": "nrel00000687"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001268",
+        "@id": "urn:nrel_example/nrel00001069",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -7676,14 +7451,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001268"
+                "@value": "nrel00001069"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000588",
+        "@id": "urn:nrel_example/nrel00000714",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -7692,117 +7467,72 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000588"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000464",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
-        ],
-        "http://data.ashrae.org/standard223#encloses": [
-            {
-                "@id": "urn:nrel_example/nrel00000862"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000825"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000956"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000464"
+                "@value": "nrel00000714"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001016",
+        "@id": "urn:nrel_example/nrel00001179",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001016"
+                "@value": "nrel00001179"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000456",
+        "@id": "urn:nrel_example/nrel00000556",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000456"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000482",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000482"
+                "@value": "nrel00000556"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001329",
+        "@id": "urn:nrel_example/nrel00001041",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000207"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000709"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001329"
+                "@value": "nrel00001041"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000465",
+        "@id": "urn:nrel_example/nrel00001049",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -7811,14 +7541,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000465"
+                "@value": "nrel00001049"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001316",
+        "@id": "urn:nrel_example/nrel00000459",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -7827,126 +7557,115 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001316"
+                "@value": "nrel00000459"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000144",
+        "@id": "urn:nrel_example/nrel00001084",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000144"
+                "@value": "nrel00001084"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001037",
+        "@id": "urn:nrel_example/nrel00000881",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000722"
+                "@id": "urn:nrel_example/nrel00001194"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000820"
+                "@id": "urn:nrel_example/nrel00000544"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001037"
+                "@value": "nrel00000881"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000669",
+        "@id": "urn:nrel_example/nrel00000183",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000669"
+                "@value": "nrel00000183"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000628",
+        "@id": "urn:nrel_example/nrel00001110",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000677"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001262"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000632"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000716"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000628"
+                "@value": "nrel00001110"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001325",
+        "@id": "urn:nrel_example/nrel00001087",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Filter"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000724"
+                "@id": "urn:nrel_example/nrel00000107"
             },
             {
-                "@id": "urn:nrel_example/nrel00000802"
+                "@id": "urn:nrel_example/nrel00000908"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001213"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001325"
+                "@value": "nrel00001087"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000390",
+        "@id": "urn:nrel_example/nrel00000065",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -7955,120 +7674,109 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:nrel_example/nrel00000948"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000390"
+                "@value": "nrel00000065"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000834",
+        "@id": "urn:nrel_example/nrel00000924",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000834"
+                "@value": "nrel00000924"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001173",
+        "@id": "urn:nrel_example/nrel00000319",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00001173"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001049",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001049"
+                "@value": "nrel00000319"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000111",
+        "@id": "urn:nrel_example/nrel00000798",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000111"
+                "@value": "nrel00000798"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000789",
+        "@id": "urn:nrel_example/nrel00000280",
         "@type": [
             "http://data.ashrae.org/standard223#FanCoilUnit"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000361"
+                "@id": "urn:nrel_example/nrel00000003"
             },
             {
-                "@id": "urn:nrel_example/nrel00000381"
+                "@id": "urn:nrel_example/nrel00000055"
             },
             {
-                "@id": "urn:nrel_example/nrel00000770"
+                "@id": "urn:nrel_example/nrel00000848"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00001025"
+                "@id": "urn:nrel_example/nrel00000278"
             },
             {
-                "@id": "urn:nrel_example/nrel00001301"
+                "@id": "urn:nrel_example/nrel00001157"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000442"
+                "@id": "urn:nrel_example/nrel00000988"
             },
             {
-                "@id": "urn:nrel_example/nrel00000481"
+                "@id": "urn:nrel_example/nrel00001152"
             },
             {
-                "@id": "urn:nrel_example/nrel00000918"
+                "@id": "urn:nrel_example/nrel00001204"
             },
             {
-                "@id": "urn:nrel_example/nrel00001238"
+                "@id": "urn:nrel_example/nrel00001244"
             },
             {
-                "@id": "urn:nrel_example/nrel00001324"
+                "@id": "urn:nrel_example/nrel00001282"
             }
         ],
         "http://data.ashrae.org/standard223#hasRole": [
@@ -8081,12 +7789,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000789"
+                "@value": "nrel00000280"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000305",
+        "@id": "urn:nrel_example/nrel00001050",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -8097,65 +7805,55 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000305"
+                "@value": "nrel00001050"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000844",
+        "@id": "urn:nrel_example/nrel00001226",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000844"
+                "@value": "nrel00001226"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000952",
+        "@id": "urn:nrel_example/nrel00001258",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000120"
+            },
             {
-                "@value": "nrel00000952"
+                "@id": "urn:nrel_example/nrel00000415"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000468",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000349"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000644"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000468"
+                "@value": "nrel00001258"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001124",
+        "@id": "urn:nrel_example/nrel00001026",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -8166,139 +7864,107 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001124"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000869",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000869"
+                "@value": "nrel00001026"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000735",
+        "@id": "urn:nrel_example/nrel00001297",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#TerminalUnit"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000084"
+            },
             {
-                "@value": "nrel00000735"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000007",
-        "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
+                "@id": "urn:nrel_example/nrel00000230"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000383"
+                "@id": "urn:nrel_example/nrel00000693"
             },
             {
-                "@id": "urn:nrel_example/nrel00000749"
+                "@id": "urn:nrel_example/nrel00000815"
             },
             {
-                "@id": "urn:nrel_example/nrel00001042"
+                "@id": "urn:nrel_example/nrel00000881"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000430"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000715"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000903"
+                "@id": "urn:nrel_example/nrel00001123"
             },
             {
-                "@id": "urn:nrel_example/nrel00001256"
+                "@id": "urn:nrel_example/nrel00001194"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000795"
+                "@id": "urn:nrel_example/nrel00000373"
             },
             {
-                "@id": "urn:nrel_example/nrel00000946"
+                "@id": "urn:nrel_example/nrel00000544"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001022"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000007"
+                "@value": "nrel00001297"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001289",
+        "@id": "urn:nrel_example/nrel00000933",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001289"
+                "@value": "nrel00000933"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000396",
+        "@id": "urn:nrel_example/nrel00000129",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000278"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000603"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000396"
+                "@value": "nrel00000129"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000908",
+        "@id": "urn:nrel_example/nrel00000307",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000397"
+                "@id": "urn:nrel_example/nrel00000517"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -8308,271 +7974,345 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000908"
+                "@value": "nrel00000307"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000512",
+        "@id": "urn:nrel_example/nrel00001324",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "nrel00000512"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000821",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000821"
+                "@value": "nrel00001324"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001322",
+        "@id": "urn:nrel_example/nrel00000852",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001322"
+                "@value": "nrel00000852"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000950",
+        "@id": "urn:nrel_example/nrel00000200",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:nrel_example/nrel00000354"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000950"
+                "@value": "nrel00000200"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000768",
+        "@id": "urn:nrel_example/nrel00000939",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00001047"
+                "@id": "urn:nrel_example/nrel00000281"
             },
             {
-                "@id": "urn:nrel_example/nrel00001068"
+                "@id": "urn:nrel_example/nrel00000474"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000308"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001090"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000768"
+                "@value": "nrel00000939"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000848",
+        "@id": "urn:nrel_example/nrel00000187",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
+            "http://data.ashrae.org/standard223#TerminalUnit"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000581"
+                "@id": "urn:nrel_example/nrel00000205"
             },
             {
-                "@id": "urn:nrel_example/nrel00000754"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000146"
+                "@id": "urn:nrel_example/nrel00000273"
             },
             {
-                "@id": "urn:nrel_example/nrel00000570"
+                "@id": "urn:nrel_example/nrel00000369"
             },
             {
-                "@id": "urn:nrel_example/nrel00001013"
+                "@id": "urn:nrel_example/nrel00000925"
             },
             {
-                "@id": "urn:nrel_example/nrel00001323"
+                "@id": "urn:nrel_example/nrel00001315"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000511"
+                "@id": "urn:nrel_example/nrel00000441"
             },
             {
-                "@id": "urn:nrel_example/nrel00000727"
-            },
+                "@id": "urn:nrel_example/nrel00001047"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000774"
+                "@id": "urn:nrel_example/nrel00000118"
             },
             {
-                "@id": "urn:nrel_example/nrel00001184"
+                "@id": "urn:nrel_example/nrel00000132"
             },
             {
-                "@id": "urn:nrel_example/nrel00001287"
+                "@id": "urn:nrel_example/nrel00000758"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000848"
+                "@value": "nrel00000187"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001199",
+        "@id": "urn:nrel_example/nrel00000408",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000096"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001032"
+                "@value": "nrel00000408"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000746",
+        "@type": [
+            "http://data.ashrae.org/standard223#EAU",
+            "http://data.ashrae.org/standard223#Equipment"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000056"
+                "@id": "urn:nrel_example/nrel00000343"
             },
             {
-                "@id": "urn:nrel_example/nrel00000242"
+                "@id": "urn:nrel_example/nrel00000429"
             },
             {
-                "@id": "urn:nrel_example/nrel00000277"
+                "@id": "urn:nrel_example/nrel00000675"
             },
             {
-                "@id": "urn:nrel_example/nrel00000289"
+                "@id": "urn:nrel_example/nrel00000771"
             },
             {
-                "@id": "urn:nrel_example/nrel00000452"
+                "@id": "urn:nrel_example/nrel00001003"
             },
             {
-                "@id": "urn:nrel_example/nrel00000559"
+                "@id": "urn:nrel_example/nrel00001089"
             },
             {
-                "@id": "urn:nrel_example/nrel00000929"
+                "@id": "urn:nrel_example/nrel00001100"
             },
             {
-                "@id": "urn:nrel_example/nrel00001028"
+                "@id": "urn:nrel_example/nrel00001119"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000050"
             },
             {
-                "@id": "urn:nrel_example/nrel00001066"
+                "@id": "urn:nrel_example/nrel00000134"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000669"
             },
             {
-                "@id": "urn:nrel_example/nrel00001224"
+                "@id": "urn:nrel_example/nrel00000853"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001199"
+                "@value": "nrel00000746"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000064",
+        "@id": "urn:nrel_example/nrel00000878",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@value": "nrel00000878"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000114",
+        "@type": [
+            "http://data.ashrae.org/standard223#PhysicalSpace"
+        ],
+        "http://data.ashrae.org/standard223#encloses": [
+            {
+                "@id": "urn:nrel_example/nrel00000600"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000477"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000594"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000064"
+                "@value": "nrel00000114"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000741",
+        "@id": "urn:nrel_example/nrel00000484",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000463"
+                "@id": "urn:nrel_example/nrel00000059"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000282"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001307"
+                "@id": "urn:nrel_example/nrel00000113"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000741"
+                "@value": "nrel00000484"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000720",
+        "@id": "urn:nrel_example/nrel00000699",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000535"
+            }
+        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000441"
+                "@value": "nrel00000699"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000238",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000720"
+                "@value": "nrel00000238"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000892",
+        "@id": "urn:nrel_example/nrel00000434",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000077"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000434"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000390",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -8581,265 +8321,245 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000892"
+                "@value": "nrel00000390"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000126",
+        "@id": "urn:nrel_example/nrel00000073",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "urn:nrel_example/nrel00000961"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "urn:nrel_example/nrel00000332"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000126"
+                "@value": "nrel00000073"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000081",
+        "@id": "urn:nrel_example/nrel00001146",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000081"
+                "@value": "nrel00001146"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000629",
+        "@id": "urn:nrel_example/nrel00001104",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00001104"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000830",
+        "@type": [
+            "http://data.ashrae.org/standard223#Fan"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000318"
+                "@id": "urn:nrel_example/nrel00000252"
             },
             {
-                "@id": "urn:nrel_example/nrel00000393"
+                "@id": "urn:nrel_example/nrel00001159"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000105"
+                "@id": "urn:nrel_example/nrel00000238"
             },
             {
-                "@id": "urn:nrel_example/nrel00000128"
+                "@id": "urn:nrel_example/nrel00000359"
             },
             {
-                "@id": "urn:nrel_example/nrel00000218"
+                "@id": "urn:nrel_example/nrel00000427"
             },
             {
-                "@id": "urn:nrel_example/nrel00000398"
+                "@id": "urn:nrel_example/nrel00000645"
             },
             {
-                "@id": "urn:nrel_example/nrel00000519"
+                "@id": "urn:nrel_example/nrel00000791"
             },
             {
-                "@id": "urn:nrel_example/nrel00000528"
+                "@id": "urn:nrel_example/nrel00000861"
             },
             {
-                "@id": "urn:nrel_example/nrel00000540"
+                "@id": "urn:nrel_example/nrel00000880"
             },
             {
-                "@id": "urn:nrel_example/nrel00000548"
+                "@id": "urn:nrel_example/nrel00000977"
             },
             {
-                "@id": "urn:nrel_example/nrel00000702"
+                "@id": "urn:nrel_example/nrel00001019"
             },
             {
-                "@id": "urn:nrel_example/nrel00001140"
+                "@id": "urn:nrel_example/nrel00001048"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001217"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000629"
+                "@value": "nrel00000830"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000234",
+        "@id": "urn:nrel_example/nrel00000317",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000234"
+                "@value": "nrel00000317"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000557",
+        "@id": "urn:nrel_example/nrel00000778",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000557"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001102",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001102"
+                "@value": "nrel00000778"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000656",
+        "@id": "urn:nrel_example/nrel00001288",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000736"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000969"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001295"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000656"
+                "@value": "nrel00001288"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000098",
+        "@id": "urn:nrel_example/nrel00000388",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000098"
+                "@value": "nrel00000388"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000498",
+        "@id": "urn:nrel_example/nrel00000197",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000498"
+                "@value": "nrel00000197"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000363",
+        "@id": "urn:nrel_example/nrel00000172",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
-            }
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@value": "nrel00000363"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000092",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+                "@id": "urn:nrel_example/nrel00000351"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000017"
+                "@id": "urn:nrel_example/nrel00001180"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000275"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000092"
+                "@value": "nrel00000172"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000196",
+        "@id": "urn:nrel_example/nrel00000066",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -8848,159 +8568,148 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000196"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000936",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000936"
+                "@value": "nrel00000066"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001218",
+        "@id": "urn:nrel_example/nrel00000948",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001218"
+                "@value": "nrel00000948"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000411",
+        "@id": "urn:nrel_example/nrel00000227",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000411"
+                "@value": "nrel00000227"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000005",
+        "@id": "urn:nrel_example/nrel00001136",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000005"
+                "@value": "nrel00001136"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000365",
+        "@id": "urn:nrel_example/nrel00000799",
         "@type": [
-            "http://data.ashrae.org/standard223#FanCoilUnit"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000580"
+                "@id": "urn:nrel_example/nrel00000217"
             },
             {
-                "@id": "urn:nrel_example/nrel00000630"
+                "@id": "urn:nrel_example/nrel00000613"
             },
             {
-                "@id": "urn:nrel_example/nrel00001174"
+                "@id": "urn:nrel_example/nrel00001292"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000001"
+                "@id": "urn:nrel_example/nrel00000161"
             },
             {
-                "@id": "urn:nrel_example/nrel00000459"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000157"
+                "@id": "urn:nrel_example/nrel00001056"
             },
             {
-                "@id": "urn:nrel_example/nrel00000425"
+                "@id": "urn:nrel_example/nrel00001183"
             },
             {
-                "@id": "urn:nrel_example/nrel00000672"
-            },
+                "@id": "urn:nrel_example/nrel00001300"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00001109"
+                "@id": "urn:nrel_example/nrel00000147"
             },
             {
-                "@id": "urn:nrel_example/nrel00001314"
+                "@id": "urn:nrel_example/nrel00000565"
             }
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
-            },
+                "@value": "nrel00000799"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000956",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000365"
+                "@value": "nrel00000956"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000986",
+        "@id": "urn:nrel_example/nrel00000564",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000986"
+                "@value": "nrel00000564"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000485",
+        "@id": "urn:nrel_example/nrel00000448",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -9009,130 +8718,125 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000485"
+                "@value": "nrel00000448"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000643",
+        "@id": "urn:nrel_example/nrel00000553",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#encloses": [
+            {
+                "@id": "urn:nrel_example/nrel00000649"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000555"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:nrel_example/nrel00000930"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000643"
+                "@value": "nrel00000553"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000782",
+        "@id": "urn:nrel_example/nrel00000133",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000148"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000647"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001037"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000190"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000722"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001046"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001052"
+                "@id": "urn:nrel_example/nrel00000432"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000820"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001067"
+                "@id": "urn:nrel_example/nrel00001235"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000782"
+                "@value": "nrel00000133"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001026",
+        "@id": "urn:nrel_example/nrel00001181",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000737"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000915"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001026"
+                "@value": "nrel00001181"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000662",
+        "@id": "urn:nrel_example/nrel00000623",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000662"
+                "@value": "nrel00000623"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001167",
+        "@id": "urn:nrel_example/nrel00000470",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00001267"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00001165"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000743"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001167"
+                "@value": "nrel00000470"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000682",
+        "@id": "urn:nrel_example/nrel00001275",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -9143,165 +8847,185 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000682"
+                "@value": "nrel00001275"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000319",
+        "@id": "urn:nrel_example/nrel00000211",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@value": "nrel00000211"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001091",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000319"
+                "@value": "nrel00001091"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001239",
+        "@id": "urn:nrel_example/nrel00000494",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00001023"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000081"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001239"
+                "@value": "nrel00000494"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000143",
+        "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Class",
+            "http://data.ashrae.org/standard223#EnumerationKind-Override",
+            "http://www.w3.org/ns/shacl#NodeShape"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@value": "EnumerationKind Override"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2000/01/rdf-schema#subClassOf": [
             {
-                "@value": "nrel00000143"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000328",
+        "@id": "urn:nrel_example/nrel00000026",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000306"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001262"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000328"
+                "@value": "nrel00000026"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000885",
+        "@id": "urn:nrel_example/nrel00000842",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000939"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000708"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00001090"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000885"
+                "@value": "nrel00000842"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000376",
+        "@id": "urn:nrel_example/nrel00000562",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000376"
+                "@value": "nrel00000562"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000024",
+        "@id": "urn:nrel_example/nrel00001120",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000024"
+                "@value": "nrel00001120"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001229",
+        "@id": "urn:nrel_example/nrel00000659",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001229"
+                "@value": "nrel00000659"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001052",
+        "@id": "urn:nrel_example/nrel00001033",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -9310,75 +9034,101 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00000967"
+                "@id": "urn:nrel_example/nrel00001123"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001052"
+                "@value": "nrel00001033"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001210",
+        "@id": "urn:nrel_example/nrel00001259",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001210"
+                "@value": "nrel00001259"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001222",
+        "@id": "urn:nrel_example/nrel00001254",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#TerminalUnit"
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:nrel_example/nrel00000342"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000524"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000686"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000782"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001231"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000688"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000967"
+            }
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000176"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000865"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001221"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001222"
+                "@value": "nrel00001254"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000816",
+        "@id": "urn:nrel_example/nrel00000804",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001125"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000500"
+                "@id": "urn:nrel_example/nrel00000612"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000002"
+                "@id": "urn:nrel_example/nrel00000895"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000816"
+                "@value": "nrel00000804"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000996",
+        "@id": "urn:nrel_example/nrel00000955",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -9389,438 +9139,427 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000996"
+                "@value": "nrel00000955"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000752",
+        "@id": "urn:nrel_example/nrel00000649",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:nrel_example/nrel00000364"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000516"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000893"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001139"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@value": "nrel00000752"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000215",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000182"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001178"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000215"
+                "@value": "nrel00000649"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000190",
+        "@id": "urn:nrel_example/nrel00000612",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000190"
+                "@value": "nrel00000612"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001056",
+        "@id": "urn:nrel_example/nrel00000498",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001265"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001056"
+                "@value": "nrel00000498"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000965",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "@id": "http://data.ashrae.org/standard223#HeatRecoveryCoil",
+        "http://www.w3.org/2000/01/rdf-schema#subClassOf": [
             {
-                "@id": "urn:nrel_example/nrel00000080"
+                "@id": "http://data.ashrae.org/standard223#Coil"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000666",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000859"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000005"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000965"
+                "@value": "nrel00000666"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000785",
+        "@id": "urn:nrel_example/nrel00000526",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000785"
+                "@value": "nrel00000526"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000179",
+        "@id": "urn:nrel_example/nrel00001232",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000178"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000264"
-            }
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000041"
-            },
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000097"
+                "@id": "urn:nrel_example/nrel00000309"
             },
             {
-                "@id": "urn:nrel_example/nrel00000445"
+                "@id": "urn:nrel_example/nrel00000602"
             },
             {
-                "@id": "urn:nrel_example/nrel00000646"
-            },
+                "@id": "urn:nrel_example/nrel00001303"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000696"
+                "@id": "urn:nrel_example/nrel00000000"
             },
             {
-                "@id": "urn:nrel_example/nrel00000860"
+                "@id": "urn:nrel_example/nrel00000032"
             },
             {
-                "@id": "urn:nrel_example/nrel00000990"
+                "@id": "urn:nrel_example/nrel00000465"
             },
             {
-                "@id": "urn:nrel_example/nrel00001031"
-            },
+                "@id": "urn:nrel_example/nrel00001284"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00001191"
+                "@id": "urn:nrel_example/nrel00000358"
             },
             {
-                "@id": "urn:nrel_example/nrel00001230"
+                "@id": "urn:nrel_example/nrel00001220"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000179"
+                "@value": "nrel00001232"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000780",
+        "@id": "urn:nrel_example/nrel00001196",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000179"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001015"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000525"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000826"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001043"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001063"
+                "@value": "nrel00001196"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001009",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000191"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000394"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000556"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000592"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001001"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000780"
+                "@value": "nrel00001009"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001181",
+        "@id": "urn:nrel_example/nrel00000124",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000737"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000915"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001181"
+                "@value": "nrel00000124"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001232",
+        "@id": "urn:nrel_example/nrel00000703",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000309"
+                "@id": "urn:nrel_example/nrel00000215"
             },
             {
-                "@id": "urn:nrel_example/nrel00000602"
+                "@id": "urn:nrel_example/nrel00001108"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000698"
             },
             {
-                "@id": "urn:nrel_example/nrel00001303"
+                "@id": "urn:nrel_example/nrel00001188"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000000"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000032"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000703"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000549",
+        "@type": [
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000465"
+                "@id": "urn:nrel_example/nrel00000050"
             },
             {
-                "@id": "urn:nrel_example/nrel00001284"
+                "@id": "urn:nrel_example/nrel00000760"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000358"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001220"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001232"
+                "@value": "nrel00000549"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000772",
+        "@id": "urn:nrel_example/nrel00001332",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000167"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000978"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000772"
+                "@value": "nrel00001332"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000916",
+        "@id": "urn:nrel_example/nrel00000749",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000600"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000114"
+                "@id": "urn:nrel_example/nrel00000715"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001059"
+                "@id": "urn:nrel_example/nrel00000946"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000916"
+                "@value": "nrel00000749"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000381",
+        "@id": "urn:nrel_example/nrel00000567",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000049"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000582"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000657"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000165"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001040"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001074"
-            },
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001279"
+                "@value": "nrel00000567"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001056",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000175"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00000571"
+                "@id": "urn:nrel_example/nrel00001265"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000381"
+                "@value": "nrel00001056"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000078",
+        "@id": "urn:nrel_example/nrel00001133",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000078"
+                "@value": "nrel00001133"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000730",
+        "@id": "urn:nrel_example/nrel00000515",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000745"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000160"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00001286"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000730"
+                "@value": "nrel00000515"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000294",
+        "@id": "urn:nrel_example/nrel00000304",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000294"
+                "@value": "nrel00000304"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000087",
+        "@id": "urn:nrel_example/nrel00000017",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -9831,226 +9570,172 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000087"
+                "@value": "nrel00000017"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000905",
+        "@id": "urn:nrel_example/nrel00000395",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000444"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000597"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000905"
+                "@value": "nrel00000395"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000887",
+        "@id": "urn:nrel_example/nrel00000168",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001311"
+                "@id": "urn:nrel_example/nrel00001265"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000575"
+                "@id": "urn:nrel_example/nrel00000042"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000887"
+                "@value": "nrel00000168"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000825",
+        "@id": "urn:nrel_example/nrel00000803",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000825"
+                "@value": "nrel00000803"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000994",
+        "@id": "urn:nrel_example/nrel00000519",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000994"
+                "@value": "nrel00000519"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000870",
+        "@id": "urn:nrel_example/nrel00001312",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000901"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000975"
+                "@id": "urn:nrel_example/nrel00000818"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000177"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000279"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000547"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000863"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000972"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001045"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001053"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001175"
-            },
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001253"
-            },
+                "@id": "urn:nrel_example/nrel00000336"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001310"
+                "@id": "urn:nrel_example/nrel00001130"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000870"
+                "@value": "nrel00001312"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000637",
+        "@id": "urn:nrel_example/nrel00000315",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000637"
+                "@value": "nrel00000315"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000014",
+        "@id": "urn:nrel_example/nrel00000252",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000014"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000448",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000448"
+                "@value": "nrel00000252"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000747",
+        "@id": "urn:nrel_example/nrel00001234",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001023"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000710"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000747"
+                "@value": "nrel00001234"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000317",
+        "@id": "urn:nrel_example/nrel00000207",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -10059,316 +9744,307 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000317"
+                "@value": "nrel00000207"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000435",
+        "@id": "urn:nrel_example/nrel00000777",
         "@type": [
-            "http://data.ashrae.org/standard223#TerminalUnit"
+            "http://data.ashrae.org/standard223#Fan"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000110"
+                "@id": "urn:nrel_example/nrel00000776"
             },
             {
-                "@id": "urn:nrel_example/nrel00000142"
+                "@id": "urn:nrel_example/nrel00001164"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000159"
             },
             {
-                "@id": "urn:nrel_example/nrel00000460"
+                "@id": "urn:nrel_example/nrel00000185"
             },
             {
-                "@id": "urn:nrel_example/nrel00000849"
+                "@id": "urn:nrel_example/nrel00000379"
             },
             {
-                "@id": "urn:nrel_example/nrel00000917"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+                "@id": "urn:nrel_example/nrel00000450"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000462"
+                "@id": "urn:nrel_example/nrel00000563"
             },
             {
-                "@id": "urn:nrel_example/nrel00000948"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:nrel_example/nrel00000662"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000048"
+                "@id": "urn:nrel_example/nrel00000761"
             },
             {
-                "@id": "urn:nrel_example/nrel00000124"
+                "@id": "urn:nrel_example/nrel00000778"
             },
             {
-                "@id": "urn:nrel_example/nrel00000641"
+                "@id": "urn:nrel_example/nrel00000889"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000974"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001290"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000435"
+                "@value": "nrel00000777"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001205",
+        "@id": "urn:nrel_example/nrel00000614",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000504"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000263"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001205"
+                "@value": "nrel00000614"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001021",
+        "@id": "urn:nrel_example/nrel00001014",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000186"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001301"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001021"
+                "@value": "nrel00001014"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000313",
+        "@id": "urn:nrel_example/nrel00001082",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000296"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000428"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000066"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001269"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000313"
+                "@value": "nrel00001082"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000160",
+        "@id": "urn:nrel_example/nrel00000482",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
-        ],
-        "http://data.ashrae.org/standard223#encloses": [
-            {
-                "@id": "urn:nrel_example/nrel00000587"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000225"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001286"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000160"
+                "@value": "nrel00000482"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000139",
+        "@id": "urn:nrel_example/nrel00001290",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000139"
+                "@value": "nrel00001290"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000671",
+        "@id": "urn:nrel_example/nrel00000918",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000671"
+                "@value": "nrel00000918"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000867",
+        "@id": "urn:nrel_example/nrel00000454",
         "@type": [
-            "http://data.ashrae.org/standard223#Zone"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#hasDomainSpace": [
-            {
-                "@id": "urn:nrel_example/nrel00000080"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000122"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000587"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000600"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000631"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000736"
-            },
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000862"
+                "@id": "urn:nrel_example/nrel00000019"
             },
             {
-                "@id": "urn:nrel_example/nrel00001125"
-            },
+                "@id": "urn:nrel_example/nrel00001018"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00001197"
+                "@id": "urn:nrel_example/nrel00000411"
             },
             {
-                "@id": "urn:nrel_example/nrel00001267"
+                "@id": "urn:nrel_example/nrel00000962"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000867"
+                "@value": "nrel00000454"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000466",
+        "@id": "urn:nrel_example/nrel00000063",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000466"
+                "@value": "nrel00000063"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000550",
+        "@id": "urn:nrel_example/nrel00000430",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@value": "nrel00000430"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001068",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000550"
+                "@value": "nrel00001068"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000713",
+        "@id": "urn:nrel_example/nrel00000814",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@value": "nrel00000814"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001065",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000713"
+                "@value": "nrel00001065"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000636",
+        "@id": "urn:nrel_example/nrel00000419",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000636"
+                "@value": "nrel00000419"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001032",
+        "@id": "urn:nrel_example/nrel00000621",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -10377,30 +10053,35 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001032"
+                "@value": "nrel00000621"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000318",
+        "@id": "urn:nrel_example/nrel00000417",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000318"
+                "@value": "nrel00000417"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000793",
+        "@id": "urn:nrel_example/nrel00001319",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -10409,159 +10090,141 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000793"
+                "@value": "nrel00001319"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000191",
+        "@id": "urn:nrel_example/nrel00000264",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000191"
+                "@value": "nrel00000264"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000243",
+        "@id": "urn:nrel_example/nrel00001073",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000243"
+                "@value": "nrel00001073"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000275",
+        "@id": "urn:nrel_example/nrel00000636",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000275"
+                "@value": "nrel00000636"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000984",
+        "@id": "urn:nrel_example/nrel00001322",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000984"
+                "@value": "nrel00001322"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000547",
+        "@id": "urn:nrel_example/nrel00001044",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "urn:nrel_example/nrel00000364"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:nrel_example/nrel00000553"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000555"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000547"
+                "@value": "nrel00001044"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000140",
+        "@id": "urn:nrel_example/nrel00000302",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000140"
+                "@value": "nrel00000302"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000500",
+        "@id": "urn:nrel_example/nrel00000269",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
-        ],
-        "http://data.ashrae.org/standard223#encloses": [
-            {
-                "@id": "urn:nrel_example/nrel00001125"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000216"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001168"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000500"
+                "@value": "nrel00000269"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001006",
+        "@id": "urn:nrel_example/nrel00000385",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -10570,446 +10233,521 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001006"
+                "@value": "nrel00000385"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000710",
+        "@id": "urn:nrel_example/nrel00001223",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "urn:nrel_example/nrel00000786"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001149"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "urn:nrel_example/nrel00000363"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000489"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000710"
+                "@value": "nrel00001223"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000198",
+        "@id": "urn:nrel_example/nrel00000756",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000198"
+                "@value": "nrel00000756"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000165",
+        "@id": "urn:nrel_example/nrel00001079",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000966"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000282"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000109"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000165"
+                "@value": "nrel00001079"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000992",
+        "@id": "urn:nrel_example/nrel00000371",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000211"
+                "@id": "urn:nrel_example/nrel00000723"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001275"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000034"
+                "@id": "urn:nrel_example/nrel00000033"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000136"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000239"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000385"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000560"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000584"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000928"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001150"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001151"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001171"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000992"
+                "@value": "nrel00000371"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001304",
+        "@id": "urn:nrel_example/nrel00001189",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001304"
+                "@value": "nrel00001189"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000997",
+        "@id": "urn:nrel_example/nrel00000331",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000997"
+                "@value": "nrel00000331"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000585",
+        "@id": "urn:nrel_example/nrel00000300",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00001050"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000518"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000585"
+                "@value": "nrel00000300"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000185",
+        "@id": "urn:nrel_example/nrel00001070",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000185"
+                "@value": "nrel00001070"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000507",
+        "@id": "urn:nrel_example/nrel00000839",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#CoolingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00001092"
+            },
             {
-                "@value": "nrel00000507"
+                "@id": "urn:nrel_example/nrel00001115"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000337",
-        "@type": [
-            "http://data.ashrae.org/standard223#Valve"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000469"
+                "@id": "urn:nrel_example/nrel00000356"
             },
             {
-                "@id": "urn:nrel_example/nrel00000509"
+                "@id": "urn:nrel_example/nrel00000508"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001062"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001189"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000119"
+                "@id": "urn:nrel_example/nrel00000125"
             },
             {
-                "@id": "urn:nrel_example/nrel00000671"
+                "@id": "urn:nrel_example/nrel00000552"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000654"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001126"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001247"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000337"
+                "@value": "nrel00000839"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000539",
+        "@id": "urn:nrel_example/nrel00001162",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000069"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000482"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000111"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001319"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000539"
+                "@value": "nrel00001162"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000090",
+        "@id": "urn:nrel_example/nrel00000192",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000466"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+                "@id": "urn:nrel_example/nrel00000971"
+            },
             {
-                "@id": "urn:nrel_example/nrel00001121"
+                "@id": "urn:nrel_example/nrel00001169"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000068"
+                "@id": "urn:nrel_example/nrel00001060"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001327"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000090"
+                "@value": "nrel00000192"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000638",
+        "@id": "urn:nrel_example/nrel00000215",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000638"
+                "@value": "nrel00000215"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000058",
+        "@id": "urn:nrel_example/nrel00001098",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000760"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000984"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001260"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000058"
+                "@value": "nrel00001098"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001150",
+        "@id": "urn:nrel_example/nrel00000669",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001150"
+                "@value": "nrel00000669"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000778",
+        "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Class",
+            "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus",
+            "http://www.w3.org/ns/shacl#NodeShape"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@value": "EnumerationKind AlarmStatus"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#subClassOf": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000474",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000778"
+                "@value": "nrel00000474"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000061",
+        "@id": "urn:nrel_example/nrel00001185",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
+            "http://data.ashrae.org/standard223#TerminalUnit"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000062"
+                "@id": "urn:nrel_example/nrel00000414"
             },
             {
-                "@id": "urn:nrel_example/nrel00001199"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000240"
+                "@id": "urn:nrel_example/nrel00000533"
             },
             {
-                "@id": "urn:nrel_example/nrel00000586"
+                "@id": "urn:nrel_example/nrel00000667"
             },
             {
-                "@id": "urn:nrel_example/nrel00000964"
+                "@id": "urn:nrel_example/nrel00000755"
             },
             {
-                "@id": "urn:nrel_example/nrel00001268"
+                "@id": "urn:nrel_example/nrel00001329"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000498"
+                "@id": "urn:nrel_example/nrel00000207"
             },
             {
-                "@id": "urn:nrel_example/nrel00000529"
-            },
+                "@id": "urn:nrel_example/nrel00000864"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000718"
+                "@id": "urn:nrel_example/nrel00000443"
             },
             {
-                "@id": "urn:nrel_example/nrel00001158"
+                "@id": "urn:nrel_example/nrel00000709"
             },
             {
-                "@id": "urn:nrel_example/nrel00001261"
+                "@id": "urn:nrel_example/nrel00001163"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000061"
+                "@value": "nrel00001185"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000535",
+        "@id": "urn:nrel_example/nrel00000550",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000691"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000699"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000535"
+                "@value": "nrel00000550"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001305",
+        "@id": "urn:nrel_example/nrel00000358",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000399"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000438"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000603"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000640"
-            },
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000775"
-            },
+                "@value": "nrel00000358"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001219",
+        "@type": [
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000806"
+                "@id": "urn:nrel_example/nrel00000462"
             },
             {
                 "@id": "urn:nrel_example/nrel00000924"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000942"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000947"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001007"
-            },
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001068"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001080"
-            },
+                "@value": "nrel00001219"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000406",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00001193"
+                "@id": "urn:nrel_example/nrel00001211"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -11019,256 +10757,269 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001305"
+                "@value": "nrel00000406"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000291",
+        "@id": "urn:nrel_example/nrel00001188",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000169"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001009"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000027"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000837"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000291"
+                "@value": "nrel00001188"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001077",
+        "@id": "urn:nrel_example/nrel00000557",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000134"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001077"
+                "@value": "nrel00000557"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000240",
+        "@id": "urn:nrel_example/nrel00000333",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000589"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000240"
+                "@value": "nrel00000333"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000109",
+        "@id": "urn:nrel_example/nrel00000394",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000109"
+                "@value": "nrel00000394"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000929",
+        "@id": "urn:nrel_example/nrel00001252",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00001252"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000139",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000929"
+                "@value": "nrel00000139"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000088",
+        "@id": "urn:nrel_example/nrel00000411",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000986"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001194"
+                "@value": "nrel00000411"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000583",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000088"
+                "@value": "nrel00000583"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000407",
+        "@id": "urn:nrel_example/nrel00000082",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000407"
+                "@value": "nrel00000082"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000864",
+        "@id": "urn:nrel_example/nrel00000115",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000864"
+                "@value": "nrel00000115"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001233",
+        "@id": "urn:nrel_example/nrel00001209",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001233"
+                "@value": "nrel00001209"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001295",
+        "@id": "urn:nrel_example/nrel00000042",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001295"
+                "@value": "nrel00000042"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000801",
+        "@id": "urn:nrel_example/nrel00000793",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000801"
+                "@value": "nrel00000793"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000639",
+        "@id": "urn:nrel_example/nrel00001025",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000639"
+                "@value": "nrel00001025"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000424",
+        "@id": "urn:nrel_example/nrel00000251",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000077"
-            }
-        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
@@ -11276,81 +11027,76 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000424"
+                "@value": "nrel00000251"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000432",
+        "@id": "urn:nrel_example/nrel00001105",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000432"
+                "@value": "nrel00001105"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000010",
+        "@id": "urn:nrel_example/nrel00000432",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000818"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000336"
+                "@value": "nrel00000432"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001270",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000739"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000010"
+                "@value": "nrel00001270"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000815",
+        "@id": "urn:nrel_example/nrel00000716",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00001033"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001229"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000762"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001041"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000815"
+                "@value": "nrel00000716"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000147",
+        "@id": "urn:nrel_example/nrel00000488",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -11366,263 +11112,219 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000147"
+                "@value": "nrel00000488"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000938",
+        "@id": "urn:nrel_example/nrel00000529",
         "@type": [
-            "http://data.ashrae.org/standard223#TerminalUnit"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000073"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000324"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000510"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001223"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001232"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000742"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000961"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000064"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000332"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000475"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "nrel00000938"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000229",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000229"
+                "@value": "nrel00000529"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000377",
+        "@id": "urn:nrel_example/nrel00000917",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "urn:nrel_example/nrel00000948"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:nrel_example/nrel00000124"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000377"
+                "@value": "nrel00000917"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000794",
+        "@id": "urn:nrel_example/nrel00000518",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001197"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001121"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001306"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000794"
+                "@value": "nrel00000518"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001291",
+        "@id": "urn:nrel_example/nrel00000941",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000421"
-            },
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000919"
+                "@id": "urn:nrel_example/nrel00000251"
             },
             {
-                "@id": "urn:nrel_example/nrel00001029"
+                "@id": "urn:nrel_example/nrel00000846"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000026"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000082"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000388"
-            },
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:nrel_example/nrel00000785"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000094"
+                "@id": "urn:nrel_example/nrel00000404"
             },
             {
-                "@id": "urn:nrel_example/nrel00000673"
+                "@id": "urn:nrel_example/nrel00000681"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001291"
+                "@value": "nrel00000941"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000119",
+        "@id": "urn:nrel_example/nrel00000415",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000119"
+                "@value": "nrel00000415"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000410",
+        "@id": "urn:nrel_example/nrel00000009",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000410"
+                "@value": "nrel00000009"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001086",
+        "@id": "urn:nrel_example/nrel00000006",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001086"
+                "@value": "nrel00000006"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000266",
+        "@id": "urn:nrel_example/nrel00001305",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000620"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:nrel_example/nrel00000399"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000260"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000438"
+            },
             {
-                "@value": "nrel00000266"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001243",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+                "@id": "urn:nrel_example/nrel00000603"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000281"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+                "@id": "urn:nrel_example/nrel00000640"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000708"
+                "@id": "urn:nrel_example/nrel00000775"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000806"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000924"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000942"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000947"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001007"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001068"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001080"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001193"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000866"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001243"
+                "@value": "nrel00001305"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000554",
+        "@id": "urn:nrel_example/nrel00000504",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -11631,33 +11333,28 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000554"
+                "@value": "nrel00000504"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000136",
+        "@id": "urn:nrel_example/nrel00000040",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000136"
+                "@value": "nrel00000040"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000860",
+        "@id": "urn:nrel_example/nrel00001327",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -11668,12 +11365,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000860"
+                "@value": "nrel00001327"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000100",
+        "@id": "urn:nrel_example/nrel00000658",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -11684,232 +11381,280 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000100"
+                "@value": "nrel00000658"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000258",
+        "@id": "urn:nrel_example/nrel00000690",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000459"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001007"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000258"
+                "@value": "nrel00000690"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001096",
+        "@id": "urn:nrel_example/nrel00000960",
         "@type": [
-            "http://data.ashrae.org/standard223#Junction"
+            "http://data.ashrae.org/standard223#TerminalUnit"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000265"
+                "@id": "urn:nrel_example/nrel00000192"
             },
             {
-                "@id": "urn:nrel_example/nrel00000876"
+                "@id": "urn:nrel_example/nrel00000494"
             },
             {
-                "@id": "urn:nrel_example/nrel00001135"
+                "@id": "urn:nrel_example/nrel00000531"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000747"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001008"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000635"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001023"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000081"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000710"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001138"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001096"
+                "@value": "nrel00000960"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001139",
+        "@id": "urn:nrel_example/nrel00000393",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001139"
+                "@value": "nrel00000393"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000875",
+        "@id": "urn:nrel_example/nrel00000644",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000107"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000899"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000875"
+                "@value": "nrel00000644"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000070",
+        "@id": "urn:nrel_example/nrel00000446",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Filter"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:nrel_example/nrel00000255"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000892"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000564"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000070"
+                "@value": "nrel00000446"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000171",
+        "@id": "urn:nrel_example/nrel00000033",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000098"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001207"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000171"
+                "@value": "nrel00000033"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000184",
+        "@id": "urn:nrel_example/nrel00000036",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000184"
+                "@value": "nrel00000036"
             }
         ]
     },
     {
-        "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus",
+        "@id": "urn:nrel_example/nrel00000353",
         "@type": [
-            "http://data.ashrae.org/standard223#Class",
-            "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus",
-            "http://www.w3.org/ns/shacl#NodeShape"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@value": "EnumerationKind AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#subClassOf": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind"
+                "@value": "nrel00000353"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000883",
+        "@id": "urn:nrel_example/nrel00000976",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000883"
+                "@value": "nrel00000976"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000138",
+        "@id": "urn:nrel_example/nrel00000273",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000214"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000293"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000920"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000040"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000638"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000720"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001069"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000412"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000419"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000138"
+                "@value": "nrel00000273"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000620",
+        "@id": "urn:nrel_example/nrel00001027",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000122"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000206"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000537"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000620"
+                "@value": "nrel00001027"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000314",
+        "@id": "urn:nrel_example/nrel00000316",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -11918,83 +11663,70 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000314"
+                "@value": "nrel00000316"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000904",
+        "@id": "urn:nrel_example/nrel00000537",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000112"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000123"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000248"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000874"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000973"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000996"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000140"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000298"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000330"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001239"
-            },
+                "@value": "nrel00000537"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001194",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001317"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000904"
+                "@value": "nrel00001194"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001332",
+        "@id": "urn:nrel_example/nrel00000202",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001332"
+                "@value": "nrel00000202"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000820",
+        "@id": "urn:nrel_example/nrel00000993",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -12010,148 +11742,179 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000820"
+                "@value": "nrel00000993"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000296",
+        "@id": "urn:nrel_example/nrel00000068",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000296"
+                "@value": "nrel00000068"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000470",
+        "@id": "urn:nrel_example/nrel00000128",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001267"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001165"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000743"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000470"
+                "@value": "nrel00000128"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001024",
+        "@id": "urn:nrel_example/nrel00000303",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000208"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000947"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001024"
+                "@value": "nrel00000303"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000372",
+        "@id": "urn:nrel_example/nrel00000405",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000893"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000553"
+                "@value": "nrel00000405"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000603",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000930"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000372"
+                "@value": "nrel00000603"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000544",
+        "@id": "urn:nrel_example/nrel00000401",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000544"
+                "@value": "nrel00000401"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001075",
+        "@id": "urn:nrel_example/nrel00000568",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Fan"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "urn:nrel_example/nrel00000898"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001051"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "urn:nrel_example/nrel00000197"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000292"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000402"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000636"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000697"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000832"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000945"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000981"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001058"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001106"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001201"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001075"
+                "@value": "nrel00000568"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000640",
+        "@id": "urn:nrel_example/nrel00000208",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -12160,179 +11923,184 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000640"
+                "@value": "nrel00000208"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000254",
+        "@id": "urn:nrel_example/nrel00000491",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000424"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001274"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000288"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00000617"
+                "@id": "urn:nrel_example/nrel00000864"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000254"
+                "@value": "nrel00000491"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000532",
+        "@id": "urn:nrel_example/nrel00000113",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000532"
+                "@value": "nrel00000113"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001277",
+        "@id": "urn:nrel_example/nrel00000256",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00001080"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001123"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001277"
+                "@value": "nrel00000256"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000400",
+        "@id": "urn:nrel_example/nrel00000895",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000305"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000738"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000400"
+                "@value": "nrel00000895"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001297",
+        "@id": "urn:nrel_example/nrel00000179",
         "@type": [
-            "http://data.ashrae.org/standard223#TerminalUnit"
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000084"
+                "@id": "urn:nrel_example/nrel00000178"
             },
             {
-                "@id": "urn:nrel_example/nrel00000230"
+                "@id": "urn:nrel_example/nrel00000264"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000041"
             },
             {
-                "@id": "urn:nrel_example/nrel00000693"
+                "@id": "urn:nrel_example/nrel00000097"
             },
             {
-                "@id": "urn:nrel_example/nrel00000815"
+                "@id": "urn:nrel_example/nrel00000445"
             },
             {
-                "@id": "urn:nrel_example/nrel00000881"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+                "@id": "urn:nrel_example/nrel00000646"
+            },
             {
-                "@id": "urn:nrel_example/nrel00001123"
+                "@id": "urn:nrel_example/nrel00000696"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000860"
             },
             {
-                "@id": "urn:nrel_example/nrel00001194"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:nrel_example/nrel00000990"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000373"
+                "@id": "urn:nrel_example/nrel00001031"
             },
             {
-                "@id": "urn:nrel_example/nrel00000544"
+                "@id": "urn:nrel_example/nrel00001191"
             },
             {
-                "@id": "urn:nrel_example/nrel00001022"
+                "@id": "urn:nrel_example/nrel00001230"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001297"
+                "@value": "nrel00000179"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001242",
+        "@id": "urn:nrel_example/nrel00000091",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001242"
+                "@value": "nrel00000091"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000201",
+        "@id": "urn:nrel_example/nrel00000070",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000201"
+                "@value": "nrel00000070"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001122",
+        "@id": "urn:nrel_example/nrel00000627",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -12343,335 +12111,308 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001122"
+                "@value": "nrel00000627"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000828",
+        "@id": "urn:nrel_example/nrel00000580",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000251"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+                "@id": "urn:nrel_example/nrel00000337"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000121"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:nrel_example/nrel00000741"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000071"
+                "@id": "urn:nrel_example/nrel00001190"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000828"
+                "@id": "urn:nrel_example/nrel00000229"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000389"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000463"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000756"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000702",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00000968"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001307"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000702"
+                "@value": "nrel00000580"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000677",
+        "@id": "urn:nrel_example/nrel00001067",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000208"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000677"
+                "@value": "nrel00001067"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000840",
+        "@id": "urn:nrel_example/nrel00001302",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000840"
+                "@value": "nrel00001302"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000459",
+        "@id": "urn:nrel_example/nrel00001035",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000459"
+                "@value": "nrel00001035"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000613",
+        "@id": "urn:nrel_example/nrel00001118",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000093"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000894"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000952"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001088"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000613"
+                "@value": "nrel00001118"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000492",
+        "@id": "urn:nrel_example/nrel00000079",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000492"
+                "@value": "nrel00000079"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000226",
+        "@id": "urn:nrel_example/nrel00000341",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000031"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000371"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000063"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000269"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000663"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001316"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000204"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000213"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000557"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000803"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001293"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000226"
+                "@value": "nrel00000341"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000271",
+        "@id": "urn:nrel_example/nrel00000869",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000271"
+                "@value": "nrel00000869"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000762",
+        "@id": "urn:nrel_example/nrel00000640",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000762"
+                "@value": "nrel00000640"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000918",
+        "@id": "urn:nrel_example/nrel00000135",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000340"
+            },
             {
-                "@value": "nrel00000918"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000546",
-        "@type": [
-            "http://data.ashrae.org/standard223#Equipment"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000734"
+            },
             {
-                "@value": "nrel00000546"
+                "@id": "urn:nrel_example/nrel00000906"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000817",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000051"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000075"
+            },
             {
-                "@id": "urn:nrel_example/nrel00001072"
+                "@id": "urn:nrel_example/nrel00000914"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001250"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000684"
+                "@id": "urn:nrel_example/nrel00000202"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000740"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000817"
+                "@value": "nrel00000135"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000843",
+        "@id": "urn:nrel_example/nrel00000147",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000843"
+                "@value": "nrel00000147"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000700",
+        "@id": "urn:nrel_example/nrel00000953",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000700"
+                "@value": "nrel00000953"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000753",
+        "@id": "urn:nrel_example/nrel00000645",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000753"
+                "@value": "nrel00000645"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000316",
+        "@id": "urn:nrel_example/nrel00000977",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -12680,22 +12421,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000316"
+                "@value": "nrel00000977"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000678",
+        "@id": "urn:nrel_example/nrel00000399",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000931"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001256"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -12704,93 +12437,109 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000678"
+                "@value": "nrel00000399"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000366",
+        "@id": "urn:nrel_example/nrel00000531",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001023"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00001138"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000366"
+                "@value": "nrel00000531"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001187",
+        "@id": "urn:nrel_example/nrel00000365",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#FanCoilUnit"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000733"
+                "@id": "urn:nrel_example/nrel00000580"
             },
             {
-                "@id": "urn:nrel_example/nrel00001181"
+                "@id": "urn:nrel_example/nrel00000630"
             },
             {
-                "@id": "urn:nrel_example/nrel00001205"
+                "@id": "urn:nrel_example/nrel00001174"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000504"
+                "@id": "urn:nrel_example/nrel00000001"
             },
             {
-                "@id": "urn:nrel_example/nrel00000595"
+                "@id": "urn:nrel_example/nrel00000459"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000157"
             },
             {
-                "@id": "urn:nrel_example/nrel00000705"
+                "@id": "urn:nrel_example/nrel00000425"
             },
             {
-                "@id": "urn:nrel_example/nrel00000737"
+                "@id": "urn:nrel_example/nrel00000672"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001109"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001314"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:nrel_example/nrel00000263"
+                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
             },
             {
-                "@id": "urn:nrel_example/nrel00000915"
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001187"
+                "@value": "nrel00000365"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001098",
+        "@id": "urn:nrel_example/nrel00000594",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001098"
+                "@value": "nrel00000594"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000819",
+        "@id": "urn:nrel_example/nrel00001218",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -12801,118 +12550,170 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000819"
+                "@value": "nrel00001218"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001326",
+        "@id": "urn:nrel_example/nrel00000723",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000723"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001255",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001326"
+                "@value": "nrel00001255"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000378",
+        "@id": "urn:nrel_example/nrel00000679",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000220"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000859"
+                "@value": "nrel00000679"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000149",
+        "@type": [
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000284"
+                "@id": "urn:nrel_example/nrel00000211"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000942"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000378"
+                "@value": "nrel00000149"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000757",
+        "@id": "urn:nrel_example/nrel00000771",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
+            "http://data.ashrae.org/standard223#Filter"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000629"
+                "@id": "urn:nrel_example/nrel00000307"
             },
             {
-                "@id": "urn:nrel_example/nrel00000872"
+                "@id": "urn:nrel_example/nrel00000699"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000006"
-            },
+                "@id": "urn:nrel_example/nrel00000154"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000015"
-            },
+                "@value": "nrel00000771"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000373",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000423"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001112"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000008"
-            },
+                "@value": "nrel00000373"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000626",
+        "@type": [
+            "http://data.ashrae.org/standard223#Valve"
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000545"
+                "@id": "urn:nrel_example/nrel00000004"
             },
             {
-                "@id": "urn:nrel_example/nrel00000999"
-            },
+                "@id": "urn:nrel_example/nrel00000955"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00001084"
+                "@id": "urn:nrel_example/nrel00001030"
             },
             {
-                "@id": "urn:nrel_example/nrel00001288"
+                "@id": "urn:nrel_example/nrel00001218"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000757"
+                "@value": "nrel00000626"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000480",
+        "@id": "urn:nrel_example/nrel00000998",
         "@type": [
             "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000220"
+                "@id": "urn:nrel_example/nrel00000465"
             },
             {
-                "@id": "urn:nrel_example/nrel00000420"
+                "@id": "urn:nrel_example/nrel00000786"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -12922,122 +12723,108 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000480"
+                "@value": "nrel00000998"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001309",
+        "@id": "urn:nrel_example/nrel00001177",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001309"
+                "@value": "nrel00001177"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001191",
+        "@id": "urn:nrel_example/nrel00000255",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+                "@id": "urn:nrel_example/nrel00000397"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001191"
+                "@value": "nrel00000255"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000095",
+        "@id": "urn:nrel_example/nrel00000495",
         "@type": [
-            "http://data.ashrae.org/standard223#TerminalUnit"
+            "http://data.ashrae.org/standard223#Fan"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000168"
+                "@id": "urn:nrel_example/nrel00000331"
             },
             {
-                "@id": "urn:nrel_example/nrel00000312"
-            },
+                "@id": "urn:nrel_example/nrel00001111"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000497"
+                "@id": "urn:nrel_example/nrel00000270"
             },
             {
-                "@id": "urn:nrel_example/nrel00000608"
+                "@id": "urn:nrel_example/nrel00000476"
             },
             {
-                "@id": "urn:nrel_example/nrel00000799"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+                "@id": "urn:nrel_example/nrel00000523"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000227"
+                "@id": "urn:nrel_example/nrel00000543"
             },
             {
-                "@id": "urn:nrel_example/nrel00001265"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:nrel_example/nrel00000706"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000042"
+                "@id": "urn:nrel_example/nrel00000713"
             },
             {
-                "@id": "urn:nrel_example/nrel00000726"
+                "@id": "urn:nrel_example/nrel00000730"
             },
             {
-                "@id": "urn:nrel_example/nrel00000809"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000819"
+            },
             {
-                "@value": "nrel00000095"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000341",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:nrel_example/nrel00000831"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:nrel_example/nrel00001000"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "urn:nrel_example/nrel00001039"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000341"
+                "@value": "nrel00000495"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000445",
+        "@id": "urn:nrel_example/nrel00000868",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -13053,294 +12840,304 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000445"
+                "@value": "nrel00000868"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000654",
+        "@id": "urn:nrel_example/nrel00000617",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000654"
+                "@value": "nrel00000617"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000651",
+        "@id": "urn:nrel_example/nrel00000478",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+                "@id": "urn:nrel_example/nrel00000474"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "urn:nrel_example/nrel00000708"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000345"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000651"
+                "@value": "nrel00000478"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000680",
+        "@id": "urn:nrel_example/nrel00001265",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000680"
+                "@value": "nrel00001265"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000072",
+        "@id": "urn:nrel_example/nrel00000866",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000072"
+                "@value": "nrel00000866"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001116",
+        "@id": "urn:nrel_example/nrel00000414",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001267"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001165"
+                "@id": "urn:nrel_example/nrel00000207"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000184"
+                "@id": "urn:nrel_example/nrel00001163"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001116"
+                "@value": "nrel00000414"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000800",
+        "@id": "urn:nrel_example/nrel00000755",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00001064"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+                "@id": "urn:nrel_example/nrel00000380"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000500"
+                "@id": "urn:nrel_example/nrel00000491"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000216"
+                "@id": "urn:nrel_example/nrel00000473"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000883"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000800"
+                "@value": "nrel00000755"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000632",
+        "@id": "urn:nrel_example/nrel00001311",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000632"
+                "@value": "nrel00001311"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000551",
+        "@id": "urn:nrel_example/nrel00000308",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000551"
+                "@value": "nrel00000308"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001324",
+        "@id": "urn:nrel_example/nrel00000032",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001324"
+                "@value": "nrel00000032"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000479",
+        "@id": "urn:nrel_example/nrel00000769",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "urn:nrel_example/nrel00000162"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "urn:nrel_example/nrel00000969"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000054"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000479"
+                "@value": "nrel00000769"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000330",
+        "@id": "urn:nrel_example/nrel00000651",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000330"
+                "@value": "nrel00000651"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000017",
+        "@id": "urn:nrel_example/nrel00000416",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000287"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000467"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000314"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000391"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000017"
+                "@value": "nrel00000416"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000166",
+        "@id": "urn:nrel_example/nrel00000517",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000307"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000618"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000166"
+                "@value": "nrel00000517"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000731",
+        "@id": "urn:nrel_example/nrel00000374",
         "@type": [
             "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000640"
+                "@id": "urn:nrel_example/nrel00000001"
             },
             {
-                "@id": "urn:nrel_example/nrel00001270"
+                "@id": "urn:nrel_example/nrel00000219"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -13350,248 +13147,254 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000731"
+                "@value": "nrel00000374"
             }
         ]
     },
     {
-        "@id": "http://data.ashrae.org/standard223#HeatRecoveryCoil",
-        "http://www.w3.org/2000/01/rdf-schema#subClassOf": [
+        "@id": "urn:nrel_example/nrel00000340",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Coil"
+                "@id": "urn:nrel_example/nrel00000051"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000202"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000340"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000085",
+        "@id": "urn:nrel_example/nrel00000400",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000305"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000738"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000085"
+                "@value": "nrel00000400"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000244",
+        "@id": "urn:nrel_example/nrel00000010",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
+                "@id": "urn:nrel_example/nrel00000818"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000336"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000739"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000244"
+                "@value": "nrel00000010"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000097",
+        "@id": "urn:nrel_example/nrel00000160",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00000587"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000225"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001286"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000097"
+                "@value": "nrel00000160"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000974",
+        "@id": "urn:nrel_example/nrel00000330",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000974"
+                "@value": "nrel00000330"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000655",
+        "@id": "urn:nrel_example/nrel00000271",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:nrel_example/nrel00000688"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000655"
+                "@value": "nrel00000271"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001048",
+        "@id": "urn:nrel_example/nrel00001217",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001048"
+                "@value": "nrel00001217"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000175",
+        "@id": "urn:nrel_example/nrel00000306",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000175"
+                "@value": "nrel00000306"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000324",
+        "@id": "urn:nrel_example/nrel00001261",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000961"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000064"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000324"
+                "@value": "nrel00001261"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000012",
+        "@id": "urn:nrel_example/nrel00000093",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000012"
+                "@value": "nrel00000093"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001318",
+        "@id": "urn:nrel_example/nrel00001155",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000122"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001027"
+                "@id": "urn:nrel_example/nrel00000354"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000335"
+                "@id": "urn:nrel_example/nrel00000985"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001318"
+                "@value": "nrel00001155"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000804",
+        "@id": "urn:nrel_example/nrel00000295",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000612"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000895"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000804"
+                "@value": "nrel00000295"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000541",
+        "@id": "urn:nrel_example/nrel00001262",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -13600,528 +13403,654 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000541"
+                "@value": "nrel00001262"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000591",
+        "@id": "urn:nrel_example/nrel00000601",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000039"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000416"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000604"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000200"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000306"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001136"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001226"
+                "@value": "nrel00000601"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001183",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000933"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001255"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000591"
+                "@value": "nrel00001183"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000322",
+        "@id": "urn:nrel_example/nrel00001330",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001259"
+                "@id": "urn:nrel_example/nrel00000846"
             }
         ],
         "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000500"
+                "@id": "urn:nrel_example/nrel00000121"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001168"
+                "@id": "urn:nrel_example/nrel00000576"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000322"
+                "@value": "nrel00001330"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001234",
+        "@id": "urn:nrel_example/nrel00000151",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001234"
+                "@value": "nrel00000151"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000163",
+        "@id": "urn:nrel_example/nrel00001246",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000163"
+                "@value": "nrel00001246"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000560",
+        "@id": "urn:nrel_example/nrel00000189",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "urn:nrel_example/nrel00000163"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001094"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:nrel_example/nrel00000211"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000560"
+                "@value": "nrel00000189"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000285",
+        "@id": "urn:nrel_example/nrel00001138",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000059"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001161"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000285"
+                "@value": "nrel00001138"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000552",
+        "@id": "urn:nrel_example/nrel00000289",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000552"
+                "@value": "nrel00000289"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001177",
+        "@id": "urn:nrel_example/nrel00000503",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "urn:nrel_example/nrel00000649"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "urn:nrel_example/nrel00000553"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00001178"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001177"
+                "@value": "nrel00000503"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001158",
+        "@id": "urn:nrel_example/nrel00000190",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@value": "nrel00000190"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001034",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001158"
+                "@value": "nrel00001034"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001045",
+        "@id": "urn:nrel_example/nrel00000354",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000354"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000738",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001045"
+                "@value": "nrel00000738"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000884",
+        "@id": "urn:nrel_example/nrel00000863",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000884"
+                "@value": "nrel00000863"
             }
         ]
     },
     {
-        "@id": "http://data.ashrae.org/standard223#EnumerationKind-Overridden",
+        "@id": "urn:nrel_example/nrel00000768",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus",
-            "http://data.ashrae.org/standard223#EnumerationKind-Override"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@language": "en",
-                "@value": "AlarmStatus-Ok"
+                "@id": "urn:nrel_example/nrel00001047"
             },
             {
-                "@language": "en",
-                "@value": "Override-Overridden"
+                "@id": "urn:nrel_example/nrel00001068"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000768"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001051",
+        "@id": "urn:nrel_example/nrel00001154",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00001154"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000407",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001051"
+                "@value": "nrel00000407"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000503",
+        "@id": "urn:nrel_example/nrel00000563",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000649"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000553"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001178"
+                "@value": "nrel00000563"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000595",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000503"
+                "@value": "nrel00000595"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000807",
+        "@id": "urn:nrel_example/nrel00001058",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000045"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001157"
+                "@value": "nrel00001058"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000772",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000167"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000978"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000807"
+                "@value": "nrel00000772"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001312",
+        "@id": "urn:nrel_example/nrel00000445",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000818"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000336"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001130"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001312"
+                "@value": "nrel00000445"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001081",
+        "@id": "urn:nrel_example/nrel00000811",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001081"
+                "@value": "nrel00000811"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000106",
+        "@id": "urn:nrel_example/nrel00000178",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000106"
+                "@value": "nrel00000178"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000823",
+        "@id": "urn:nrel_example/nrel00000118",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000823"
+                "@value": "nrel00000118"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000553",
+        "@id": "urn:nrel_example/nrel00000522",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000649"
+                "@id": "urn:nrel_example/nrel00000801"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000957"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000555"
+                "@id": "urn:nrel_example/nrel00000057"
             },
             {
-                "@id": "urn:nrel_example/nrel00000930"
+                "@id": "urn:nrel_example/nrel00000144"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000267"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000341"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000352"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000507"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000520"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000900"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001005"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001245"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000553"
+                "@value": "nrel00000522"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000235",
+        "@id": "urn:nrel_example/nrel00000045",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000413"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000887"
+                "@value": "nrel00000045"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000607",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001161"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001311"
+                "@value": "nrel00000607"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000683",
+        "@type": [
+            "http://data.ashrae.org/standard223#HeatExchanger"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000231"
+                "@id": "urn:nrel_example/nrel00000083"
             },
             {
-                "@id": "urn:nrel_example/nrel00000294"
+                "@id": "urn:nrel_example/nrel00000344"
             },
             {
-                "@id": "urn:nrel_example/nrel00000575"
-            },
+                "@id": "urn:nrel_example/nrel00000546"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000766"
+                "@id": "urn:nrel_example/nrel00000183"
             },
             {
-                "@id": "urn:nrel_example/nrel00000835"
+                "@id": "urn:nrel_example/nrel00000189"
             },
             {
-                "@id": "urn:nrel_example/nrel00000951"
+                "@id": "urn:nrel_example/nrel00000271"
             },
             {
-                "@id": "urn:nrel_example/nrel00001177"
-            },
+                "@id": "urn:nrel_example/nrel00000923"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00001202"
+                "@id": "urn:nrel_example/nrel00000067"
             },
             {
-                "@id": "urn:nrel_example/nrel00001216"
+                "@id": "urn:nrel_example/nrel00000163"
             },
             {
-                "@id": "urn:nrel_example/nrel00001281"
-            },
+                "@id": "urn:nrel_example/nrel00001094"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "urn:nrel_example/nrel00001332"
+                "@id": "http://data.ashrae.org/standard223#Role-Evaporator"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000235"
+                "@value": "nrel00000683"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000625",
+        "@id": "urn:nrel_example/nrel00000298",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000625"
+                "@value": "nrel00000298"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000882",
+        "@id": "urn:nrel_example/nrel00001020",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -14132,623 +14061,645 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000882"
+                "@value": "nrel00001020"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001320",
+        "@id": "urn:nrel_example/nrel00001211",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000792"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+                "@id": "urn:nrel_example/nrel00000406"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000464"
+                "@id": "urn:nrel_example/nrel00000574"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000825"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001320"
+                "@value": "nrel00001211"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000987",
+        "@id": "urn:nrel_example/nrel00000865",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000987"
+                "@value": "nrel00000865"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001207",
+        "@id": "urn:nrel_example/nrel00001176",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000137"
+            },
             {
-                "@value": "nrel00001207"
+                "@id": "urn:nrel_example/nrel00000561"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001095"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000732",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "urn:nrel_example/nrel00000625"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000668"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000810"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001102"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000046"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:nrel_example/nrel00000623"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000732"
+                "@value": "nrel00001176"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001054",
+        "@id": "urn:nrel_example/nrel00000381",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000049"
+            },
             {
-                "@value": "nrel00001054"
+                "@id": "urn:nrel_example/nrel00000582"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000657"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001321",
-        "@type": [
-            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000265"
+                "@id": "urn:nrel_example/nrel00000165"
             },
             {
-                "@id": "urn:nrel_example/nrel00000876"
+                "@id": "urn:nrel_example/nrel00001040"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001074"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001279"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000175"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000571"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001321"
+                "@value": "nrel00000381"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000159",
+        "@id": "urn:nrel_example/nrel00000184",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000159"
+                "@value": "nrel00000184"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001203",
+        "@id": "urn:nrel_example/nrel00001106",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001203"
+                "@value": "nrel00001106"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000790",
+        "@id": "urn:nrel_example/nrel00000957",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000790"
+                "@value": "nrel00000957"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000694",
+        "@id": "urn:nrel_example/nrel00000336",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000818"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000471"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000680"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000694"
+                "@value": "nrel00000336"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000340",
+        "@id": "urn:nrel_example/nrel00000258",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000051"
+                "@id": "urn:nrel_example/nrel00000459"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001007"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000202"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000340"
+                "@value": "nrel00000258"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001136",
+        "@id": "urn:nrel_example/nrel00000930",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001136"
+                "@value": "nrel00000930"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000420",
+        "@id": "urn:nrel_example/nrel00001090",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000420"
+                "@value": "nrel00001090"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001281",
+        "@id": "urn:nrel_example/nrel00000185",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001281"
+                "@value": "nrel00000185"
             }
         ]
     },
     {
-        "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override",
+        "@id": "urn:nrel_example/nrel00000117",
         "@type": [
-            "http://data.ashrae.org/standard223#Class",
-            "http://data.ashrae.org/standard223#EnumerationKind-Override",
-            "http://www.w3.org/ns/shacl#NodeShape"
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "EnumerationKind Override"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#subClassOf": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind"
+                "@id": "urn:nrel_example/nrel00000966"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000726",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:nrel_example/nrel00000282"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:nrel_example/nrel00000845"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000726"
+                "@value": "nrel00000117"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000238",
+        "@id": "urn:nrel_example/nrel00000730",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000238"
+                "@value": "nrel00000730"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001152",
+        "@id": "urn:nrel_example/nrel00000709",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001152"
+                "@value": "nrel00000709"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000205",
+        "@id": "urn:nrel_example/nrel00000332",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000025"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000076"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000194"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000299"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000205"
+                "@value": "nrel00000332"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000859",
+        "@id": "urn:nrel_example/nrel00000789",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#FanCoilUnit"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000080"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:nrel_example/nrel00000361"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000284"
+                "@id": "urn:nrel_example/nrel00000381"
             },
             {
-                "@id": "urn:nrel_example/nrel00000987"
+                "@id": "urn:nrel_example/nrel00000770"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000859"
+                "@id": "urn:nrel_example/nrel00001025"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001301"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000696",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000442"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000481"
+            },
             {
-                "@value": "nrel00000696"
+                "@id": "urn:nrel_example/nrel00000918"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001238"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001324"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000164",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+            },
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000164"
+                "@value": "nrel00000789"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000026",
+        "@id": "urn:nrel_example/nrel00000221",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000026"
+                "@value": "nrel00000221"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000646",
+        "@id": "urn:nrel_example/nrel00000943",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000646"
+                "@value": "nrel00000943"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000152",
+        "@id": "urn:nrel_example/nrel00001092",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000354"
+                "@id": "urn:nrel_example/nrel00000539"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000763"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000823"
+                "@id": "urn:nrel_example/nrel00000436"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001225"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000152"
+                "@value": "nrel00001092"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000733",
+        "@id": "urn:nrel_example/nrel00000859",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000949"
-            },
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:nrel_example/nrel00001057"
+                "@id": "urn:nrel_example/nrel00000080"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000357"
+                "@id": "urn:nrel_example/nrel00000284"
             },
             {
-                "@id": "urn:nrel_example/nrel00001017"
+                "@id": "urn:nrel_example/nrel00000987"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000733"
+                "@value": "nrel00000859"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001130",
+        "@id": "urn:nrel_example/nrel00000225",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001130"
+                "@value": "nrel00000225"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001140",
+        "@id": "urn:nrel_example/nrel00000034",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001140"
+                "@value": "nrel00000034"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001327",
+        "@id": "urn:nrel_example/nrel00001115",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000014"
+            },
             {
-                "@value": "nrel00001327"
+                "@id": "urn:nrel_example/nrel00000237"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001132",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00000102"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000108"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000327"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000338"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000453"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000633"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000732"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001118"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001148"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001206"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001132"
+                "@value": "nrel00001115"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000065",
+        "@id": "urn:nrel_example/nrel00000356",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:nrel_example/nrel00000948"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000065"
+                "@value": "nrel00000356"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000513",
+        "@id": "urn:nrel_example/nrel00000547",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
@@ -14764,160 +14715,159 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000513"
+                "@value": "nrel00000547"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000021",
+        "@id": "urn:nrel_example/nrel00000602",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000339"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001165"
+                "@id": "urn:nrel_example/nrel00000032"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000637"
+                "@id": "urn:nrel_example/nrel00000358"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000021"
+                "@value": "nrel00000602"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000522",
+        "@id": "urn:nrel_example/nrel00001170",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000801"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000957"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000057"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000144"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000267"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000341"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000352"
-            },
+                "@value": "nrel00001170"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000496",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000507"
-            },
+                "@id": "urn:nrel_example/nrel00000970"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000520"
-            },
+                "@id": "urn:nrel_example/nrel00001272"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000900"
-            },
+                "@value": "nrel00000496"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000844",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001005"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001245"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000522"
+                "@value": "nrel00000844"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000093",
+        "@id": "urn:nrel_example/nrel00000864",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000093"
+                "@value": "nrel00000864"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000274",
+        "@id": "urn:nrel_example/nrel00000751",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:nrel_example/nrel00000138"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:nrel_example/nrel00000241"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00001283"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000274"
+                "@value": "nrel00000751"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000979",
+        "@id": "urn:nrel_example/nrel00000959",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000979"
+                "@value": "nrel00000959"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000131",
+        "@id": "urn:nrel_example/nrel00000490",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00001020"
+            },
             {
-                "@value": "nrel00000131"
+                "@id": "urn:nrel_example/nrel00001200"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000597",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -14926,35 +14876,35 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000597"
+                "@value": "nrel00000490"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001038",
+        "@id": "urn:nrel_example/nrel00000677",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000676"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00000203"
+                "@id": "urn:nrel_example/nrel00000208"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001038"
+                "@value": "nrel00000677"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000983",
+        "@id": "urn:nrel_example/nrel00000169",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -14963,247 +14913,280 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000983"
+                "@value": "nrel00000169"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000631",
+        "@id": "urn:nrel_example/nrel00000007",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000138"
+                "@id": "urn:nrel_example/nrel00000383"
             },
             {
-                "@id": "urn:nrel_example/nrel00001200"
+                "@id": "urn:nrel_example/nrel00000749"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001042"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:nrel_example/nrel00000430"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000715"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000903"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001256"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000665"
+                "@id": "urn:nrel_example/nrel00000795"
             },
             {
-                "@id": "urn:nrel_example/nrel00001085"
+                "@id": "urn:nrel_example/nrel00000946"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000631"
+                "@value": "nrel00000007"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001133",
+        "@id": "urn:nrel_example/nrel00001159",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001133"
+                "@value": "nrel00001159"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001020",
+        "@id": "urn:nrel_example/nrel00000722",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001020"
+                "@value": "nrel00000722"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000446",
+        "@id": "urn:nrel_example/nrel00000545",
         "@type": [
-            "http://data.ashrae.org/standard223#Filter"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000255"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000892"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000564"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000446"
+                "@value": "nrel00000545"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000670",
+        "@id": "urn:nrel_example/nrel00000901",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@value": "nrel00000901"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001225",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000670"
+                "@value": "nrel00001225"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001323",
+        "@id": "urn:nrel_example/nrel00000299",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001323"
+                "@value": "nrel00000299"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000945",
+        "@id": "urn:nrel_example/nrel00001038",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "urn:nrel_example/nrel00000676"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "urn:nrel_example/nrel00000203"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000945"
+                "@value": "nrel00001038"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000181",
+        "@id": "urn:nrel_example/nrel00000479",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000181"
+                "@value": "nrel00000479"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000255",
+        "@id": "urn:nrel_example/nrel00001240",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000397"
-            }
-        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000255"
+                "@value": "nrel00001240"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001044",
+        "@id": "urn:nrel_example/nrel00000587",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000364"
+                "@id": "urn:nrel_example/nrel00000745"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000986"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:nrel_example/nrel00000553"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000555"
+                "@id": "urn:nrel_example/nrel00000433"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000844"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001044"
+                "@value": "nrel00000587"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000168",
+        "@id": "http://data.ashrae.org/standard223#EnumerationKind-Default",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus",
+            "http://data.ashrae.org/standard223#EnumerationKind-Override"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001265"
+                "@language": "en",
+                "@value": "AlarmStatus-Alarm"
+            },
+            {
+                "@language": "en",
+                "@value": "Override-Default"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000427",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000042"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000168"
+                "@value": "nrel00000427"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000545",
+        "@id": "urn:nrel_example/nrel00000727",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -15219,139 +15202,153 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000545"
+                "@value": "nrel00000727"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000457",
+        "@id": "urn:nrel_example/nrel00000348",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000457"
+                "@value": "nrel00000348"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000404",
+        "@id": "urn:nrel_example/nrel00000824",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000386"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000532"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000410"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001248"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000404"
+                "@value": "nrel00000824"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000894",
+        "@id": "urn:nrel_example/nrel00000525",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000894"
+                "@value": "nrel00000525"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000868",
+        "@id": "urn:nrel_example/nrel00000349",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000868"
+                "@value": "nrel00000349"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000767",
+        "@id": "urn:nrel_example/nrel00000660",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000767"
+                "@value": "nrel00000660"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001069",
+        "@id": "urn:nrel_example/nrel00000589",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000240"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000903"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001069"
+                "@value": "nrel00000589"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000474",
+        "@id": "urn:nrel_example/nrel00001000",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000474"
+                "@value": "nrel00001000"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000329",
+        "@id": "urn:nrel_example/nrel00000643",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -15362,178 +15359,154 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000329"
+                "@value": "nrel00000643"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000025",
+        "@id": "urn:nrel_example/nrel00001269",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000025"
+                "@value": "nrel00001269"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000110",
+        "@id": "urn:nrel_example/nrel00000366",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00001036"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001302"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000634"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001137"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000110"
+                "@value": "nrel00000366"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000443",
+        "@id": "urn:nrel_example/nrel00001309",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000443"
+                "@value": "nrel00001309"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001314",
+        "@id": "urn:nrel_example/nrel00000947",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001314"
+                "@value": "nrel00000947"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000690",
+        "@id": "urn:nrel_example/nrel00000825",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000690"
+                "@value": "nrel00000825"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000212",
+        "@id": "urn:nrel_example/nrel00000230",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00001194"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00001022"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000212"
+                "@value": "nrel00000230"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000837",
+        "@id": "urn:nrel_example/nrel00000618",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:nrel_example/nrel00000517"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000837"
+                "@value": "nrel00000618"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000721",
+        "@id": "urn:nrel_example/nrel00000346",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
-            }
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000439"
+            },
             {
-                "@value": "nrel00000721"
+                "@id": "urn:nrel_example/nrel00000873"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000339",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -15542,189 +15515,231 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000339"
+                "@value": "nrel00000346"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001066",
+        "@id": "urn:nrel_example/nrel00000232",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001066"
+                "@value": "nrel00000232"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000555",
+        "@id": "urn:nrel_example/nrel00001081",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@value": "nrel00001081"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000248",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000555"
+                "@value": "nrel00000248"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000428",
+        "@id": "urn:nrel_example/nrel00001103",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+            }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000428"
+                "@value": "nrel00001103"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000149",
+        "@id": "urn:nrel_example/nrel00000049",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000211"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000942"
+                "@id": "urn:nrel_example/nrel00000165"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000175"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000149"
+                "@value": "nrel00000049"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001245",
+        "@id": "urn:nrel_example/nrel00000951",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001245"
+                "@value": "nrel00000951"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001034",
+        "@id": "urn:nrel_example/nrel00000860",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001034"
+                "@value": "nrel00000860"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000520",
+        "@id": "urn:nrel_example/nrel00001094",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000520"
+                "@value": "nrel00001094"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000145",
+        "@id": "urn:nrel_example/nrel00000780",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#CoolingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00000179"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001015"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000525"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000826"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001043"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001063"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000191"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000394"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000556"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000592"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001001"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000145"
+                "@value": "nrel00000780"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001272",
+        "@id": "urn:nrel_example/nrel00000345",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001272"
+                "@value": "nrel00000345"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000043",
+        "@id": "urn:nrel_example/nrel00000025",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -15735,223 +15750,261 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000043"
+                "@value": "nrel00000025"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000567",
+        "@id": "urn:nrel_example/nrel00000476",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000567"
+                "@value": "nrel00000476"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000299",
+        "@id": "urn:nrel_example/nrel00000376",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000299"
+                "@value": "nrel00000376"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001057",
+        "@id": "urn:nrel_example/nrel00000742",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001057"
+                "@value": "nrel00000742"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001224",
+        "@id": "urn:nrel_example/nrel00000292",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001224"
+                "@value": "nrel00000292"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000040",
+        "@id": "urn:nrel_example/nrel00000453",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000040"
+                "@value": "nrel00000453"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000121",
+        "@id": "urn:nrel_example/nrel00001089",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#HeatRecoveryCoil"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000941"
+                "@id": "urn:nrel_example/nrel00000351"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000618"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000821"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001304"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000071"
+                "@id": "urn:nrel_example/nrel00000315"
             },
             {
-                "@id": "urn:nrel_example/nrel00000576"
+                "@id": "urn:nrel_example/nrel00000368"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000431"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000488"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000121"
+                "@value": "nrel00001089"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000408",
+        "@id": "urn:nrel_example/nrel00001054",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000408"
+                "@value": "nrel00001054"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000978",
+        "@id": "urn:nrel_example/nrel00001242",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000978"
+                "@value": "nrel00001242"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001221",
+        "@id": "urn:nrel_example/nrel00000209",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#FanCoilUnit"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:nrel_example/nrel00000099"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000135"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000904"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000131"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000355"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000392"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000752"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000805"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001160"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:nrel_example/nrel00001233"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+            },
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001221"
+                "@value": "nrel00000209"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000418",
+        "@id": "urn:nrel_example/nrel00000992",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000485"
+                "@id": "urn:nrel_example/nrel00000211"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000457"
+                "@id": "urn:nrel_example/nrel00000034"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000418"
+                "@value": "nrel00000992"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000472",
+        "@id": "urn:nrel_example/nrel00000461",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001241"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:nrel_example/nrel00000256"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@value": "nrel00000472"
+                "@id": "urn:nrel_example/nrel00001198"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000841",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -15960,14 +16013,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000841"
+                "@value": "nrel00000461"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001271",
+        "@id": "urn:nrel_example/nrel00000016",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -15976,14 +16029,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001271"
+                "@value": "nrel00000016"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001192",
+        "@id": "urn:nrel_example/nrel00000297",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -15992,14 +16045,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001192"
+                "@value": "nrel00000297"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000349",
+        "@id": "urn:nrel_example/nrel00001201",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -16008,249 +16061,233 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000349"
+                "@value": "nrel00001201"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001226",
+        "@id": "urn:nrel_example/nrel00001053",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "nrel00001226"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001039",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001039"
+                "@value": "nrel00001053"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000813",
+        "@id": "urn:nrel_example/nrel00001197",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00001107"
+                "@id": "urn:nrel_example/nrel00000466"
             },
             {
-                "@id": "urn:nrel_example/nrel00001302"
+                "@id": "urn:nrel_example/nrel00000590"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000499"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001306"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000813"
+                "@value": "nrel00001197"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000074",
+        "@id": "urn:nrel_example/nrel00001085",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000074"
+                "@value": "nrel00001085"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001010",
+        "@id": "urn:nrel_example/nrel00000244",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001010"
+                "@value": "nrel00000244"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000323",
+        "@id": "urn:nrel_example/nrel00000447",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#HeatRecoveryCoil"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000631"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+                "@id": "urn:nrel_example/nrel00000660"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000241"
+                "@id": "urn:nrel_example/nrel00000899"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001166"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001240"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000665"
+                "@id": "urn:nrel_example/nrel00000199"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000542"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000585"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001061"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000323"
+                "@value": "nrel00000447"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000170",
+        "@id": "urn:nrel_example/nrel00000276",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000170"
+                "@value": "nrel00000276"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001095",
+        "@id": "urn:nrel_example/nrel00000631",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000668"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:nrel_example/nrel00000138"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000046"
+                "@id": "urn:nrel_example/nrel00001200"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@value": "nrel00001095"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000917",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000948"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:nrel_example/nrel00000665"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000124"
+                "@id": "urn:nrel_example/nrel00001085"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000917"
+                "@value": "nrel00000631"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000652",
+        "@id": "urn:nrel_example/nrel00000936",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001197"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001121"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:nrel_example/nrel00000499"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "nrel00000652"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000808",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000808"
+                "@value": "nrel00000936"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000249",
+        "@id": "urn:nrel_example/nrel00001222",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000249"
+                "@value": "nrel00001222"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001208",
+        "@id": "urn:nrel_example/nrel00001112",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -16259,164 +16296,182 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001208"
+                "@value": "nrel00001112"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000142",
+        "@id": "urn:nrel_example/nrel00000367",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000948"
+                "@id": "urn:nrel_example/nrel00000219"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000464"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000641"
+                "@id": "urn:nrel_example/nrel00000956"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000142"
+                "@value": "nrel00000367"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000573",
+        "@id": "urn:nrel_example/nrel00000262",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#FanCoilUnit"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000941"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+                "@id": "urn:nrel_example/nrel00000035"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000121"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:nrel_example/nrel00000505"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000404"
+                "@id": "urn:nrel_example/nrel00000729"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000573"
+                "@id": "urn:nrel_example/nrel00000597"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000724"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000056",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+                "@id": "urn:nrel_example/nrel00000070"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000405"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000551"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000980"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001011"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+            },
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000056"
+                "@value": "nrel00000262"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000036",
+        "@id": "urn:nrel_example/nrel00000773",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000036"
+                "@value": "nrel00000773"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000182",
+        "@id": "urn:nrel_example/nrel00001296",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00001200"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000241"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000274"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000182"
+                "@value": "nrel00001296"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000594",
+        "@id": "urn:nrel_example/nrel00000213",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000594"
+                "@value": "nrel00000213"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000315",
+        "@id": "urn:nrel_example/nrel00001140",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000315"
+                "@value": "nrel00001140"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001261",
+        "@id": "urn:nrel_example/nrel00000673",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -16432,215 +16487,198 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001261"
+                "@value": "nrel00000673"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000601",
+        "@id": "urn:nrel_example/nrel00000502",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000846"
+            },
             {
-                "@value": "nrel00000601"
+                "@id": "urn:nrel_example/nrel00000948"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000878",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000878"
+                "@value": "nrel00000502"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000799",
+        "@id": "urn:nrel_example/nrel00000966",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#contains": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000217"
+                "@id": "urn:nrel_example/nrel00000059"
             },
             {
-                "@id": "urn:nrel_example/nrel00000613"
+                "@id": "urn:nrel_example/nrel00000098"
             },
             {
-                "@id": "urn:nrel_example/nrel00001292"
+                "@id": "urn:nrel_example/nrel00000658"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000161"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001056"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001183"
-            },
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:nrel_example/nrel00001300"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000147"
+                "@id": "urn:nrel_example/nrel00000109"
             },
             {
-                "@id": "urn:nrel_example/nrel00000565"
+                "@id": "urn:nrel_example/nrel00000845"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000799"
+                "@value": "nrel00000966"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001299",
+        "@id": "urn:nrel_example/nrel00001321",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000265"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000876"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001299"
+                "@value": "nrel00001321"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001131",
+        "@id": "urn:nrel_example/nrel00000871",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000941"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000121"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000681"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001131"
+                "@value": "nrel00000871"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001166",
+        "@id": "urn:nrel_example/nrel00000433",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001198"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001166"
+                "@value": "nrel00000433"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000421",
+        "@id": "urn:nrel_example/nrel00000757",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#CoolingCoil"
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:nrel_example/nrel00000629"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000872"
+            }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000814"
+                "@id": "urn:nrel_example/nrel00000006"
             },
             {
-                "@id": "urn:nrel_example/nrel00001196"
+                "@id": "urn:nrel_example/nrel00000015"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000423"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001112"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000879"
+                "@id": "urn:nrel_example/nrel00000008"
             },
             {
-                "@id": "urn:nrel_example/nrel00001097"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000545"
+            },
             {
-                "@value": "nrel00000421"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000534",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+                "@id": "urn:nrel_example/nrel00000999"
+            },
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:nrel_example/nrel00001084"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00001288"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000534"
+                "@value": "nrel00000757"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001144",
+        "@id": "urn:nrel_example/nrel00000975",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001144"
+                "@value": "nrel00000975"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000054",
+        "@id": "urn:nrel_example/nrel00000274",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -16656,192 +16694,196 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000054"
+                "@value": "nrel00000274"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000922",
+        "@id": "urn:nrel_example/nrel00001273",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000922"
+                "@value": "nrel00001273"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001267",
+        "@id": "urn:nrel_example/nrel00000908",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000186"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000236"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000245"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000339"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000444"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000627"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:nrel_example/nrel00000397"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000184"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000743"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001267"
+                "@value": "nrel00000908"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001000",
+        "@id": "urn:nrel_example/nrel00000206",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001000"
+                "@value": "nrel00000206"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001128",
+        "@id": "urn:nrel_example/nrel00000199",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00001128"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000724",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000724"
+                "@value": "nrel00000199"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000223",
+        "@id": "urn:nrel_example/nrel00000790",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000223"
+                "@value": "nrel00000790"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000242",
+        "@id": "urn:nrel_example/nrel00000008",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000242"
+                "@value": "nrel00000008"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000237",
+        "@id": "urn:nrel_example/nrel00000729",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Fan"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000018"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000619"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000023"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000060"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000201"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000232"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000614"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000843"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000878"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000886"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000926"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001083"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001146"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000237"
+                "@value": "nrel00000729"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000605",
+        "@id": "urn:nrel_example/nrel00001277",
         "@type": [
             "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000151"
+                "@id": "urn:nrel_example/nrel00001080"
             },
             {
-                "@id": "urn:nrel_example/nrel00001229"
+                "@id": "urn:nrel_example/nrel00001123"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -16851,83 +16893,97 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000605"
+                "@value": "nrel00001277"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000818",
+        "@id": "urn:nrel_example/nrel00000707",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#Pump"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000221"
+                "@id": "urn:nrel_example/nrel00000735"
             },
             {
-                "@id": "urn:nrel_example/nrel00001086"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:nrel_example/nrel00001172"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000739"
+                "@id": "urn:nrel_example/nrel00000086"
             },
             {
-                "@id": "urn:nrel_example/nrel00001130"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000089"
+            },
             {
-                "@value": "nrel00000818"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000913",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000129"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000326"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000513"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000659"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000728"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001098"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001110"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001237"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000913"
+                "@value": "nrel00000707"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000303",
+        "@id": "urn:nrel_example/nrel00001012",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00001299"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000166"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000303"
+                "@value": "nrel00001012"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000251",
+        "@id": "urn:nrel_example/nrel00001096",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Junction"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000265"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000876"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001135"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -16936,44 +16992,55 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000251"
+                "@value": "nrel00001096"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001263",
+        "@id": "urn:nrel_example/nrel00000119",
         "@type": [
-            "http://data.ashrae.org/standard223#Equipment"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+            }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001263"
+                "@value": "nrel00000119"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000739",
+        "@id": "urn:nrel_example/nrel00001156",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "urn:nrel_example/nrel00000198"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000578"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "urn:nrel_example/nrel00000788"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001006"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000739"
+                "@value": "nrel00001156"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000079",
+        "@id": "urn:nrel_example/nrel00000984",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -16984,14 +17051,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000079"
+                "@value": "nrel00000984"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001117",
+        "@id": "urn:nrel_example/nrel00000015",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -17000,154 +17067,160 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001117"
+                "@value": "nrel00000015"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001093",
+        "@id": "urn:nrel_example/nrel00001274",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "urn:nrel_example/nrel00000078"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001093"
+                "@value": "nrel00001274"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001196",
+        "@id": "urn:nrel_example/nrel00001139",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001196"
+                "@value": "nrel00001139"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001190",
+        "@id": "urn:nrel_example/nrel00000428",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000389"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000968"
+                "@value": "nrel00000428"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000057",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001190"
+                "@value": "nrel00000057"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001035",
+        "@id": "urn:nrel_example/nrel00000576",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001035"
+                "@value": "nrel00000576"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000765",
+        "@id": "urn:nrel_example/nrel00000596",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000765"
+                "@value": "nrel00000596"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000506",
+        "@id": "urn:nrel_example/nrel00001247",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000506"
+                "@value": "nrel00001247"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001084",
+        "@id": "urn:nrel_example/nrel00001095",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000668"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000046"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001084"
+                "@value": "nrel00001095"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000395",
+        "@id": "urn:nrel_example/nrel00000052",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -17158,51 +17231,46 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000395"
+                "@value": "nrel00000052"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000382",
+        "@id": "urn:nrel_example/nrel00001043",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000382"
+                "@value": "nrel00001043"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000602",
+        "@id": "urn:nrel_example/nrel00000539",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000032"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000358"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000602"
+                "@value": "nrel00000539"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000712",
+        "@id": "urn:nrel_example/nrel00001264",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -17211,14 +17279,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000712"
+                "@value": "nrel00001264"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000970",
+        "@id": "urn:nrel_example/nrel00000724",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -17227,12 +17295,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000970"
+                "@value": "nrel00000724"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000648",
+        "@id": "urn:nrel_example/nrel00001045",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -17248,49 +17316,91 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000648"
+                "@value": "nrel00001045"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001257",
+        "@id": "urn:nrel_example/nrel00000916",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000600"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000114"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00001059"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000916"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000272",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001257"
+                "@value": "nrel00000272"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000286",
+        "@id": "urn:nrel_example/nrel00000632",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000632"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001072",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000286"
+                "@value": "nrel00001072"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000781",
+        "@id": "urn:nrel_example/nrel00001135",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -17301,151 +17411,174 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000781"
+                "@value": "nrel00001135"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000057",
+        "@id": "urn:nrel_example/nrel00001116",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00001267"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00001165"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000184"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000057"
+                "@value": "nrel00001116"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000612",
+        "@id": "urn:nrel_example/nrel00000929",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000612"
+                "@value": "nrel00000929"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000836",
+        "@id": "urn:nrel_example/nrel00000800",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00001064"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000500"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000216"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000836"
+                "@value": "nrel00000800"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000269",
+        "@id": "urn:nrel_example/nrel00001320",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000792"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000464"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000825"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000269"
+                "@value": "nrel00001320"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000966",
+        "@id": "urn:nrel_example/nrel00001114",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000059"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000098"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000658"
+                "@id": "urn:nrel_example/nrel00001086"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:nrel_example/nrel00000336"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000109"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000845"
+                "@id": "urn:nrel_example/nrel00000471"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000966"
+                "@value": "nrel00001114"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000932",
+        "@id": "urn:nrel_example/nrel00000180",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000207"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001086"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000932"
+                "@value": "nrel00000180"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001043",
+        "@id": "urn:nrel_example/nrel00000245",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001043"
+                "@value": "nrel00000245"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001260",
+        "@id": "urn:nrel_example/nrel00000100",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -17456,163 +17589,134 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001260"
+                "@value": "nrel00000100"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000371",
+        "@id": "urn:nrel_example/nrel00000464",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000723"
-            },
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:nrel_example/nrel00001275"
+                "@id": "urn:nrel_example/nrel00000862"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000033"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000136"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000239"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000385"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000560"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000584"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000928"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001150"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001151"
+                "@id": "urn:nrel_example/nrel00000825"
             },
             {
-                "@id": "urn:nrel_example/nrel00001171"
+                "@id": "urn:nrel_example/nrel00000956"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000371"
+                "@value": "nrel00000464"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001040",
+        "@id": "urn:nrel_example/nrel00000940",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:nrel_example/nrel00000050"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001040"
+                "@value": "nrel00000940"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001060",
+        "@id": "urn:nrel_example/nrel00000046",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001060"
+                "@value": "nrel00000046"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000833",
+        "@id": "urn:nrel_example/nrel00000237",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000074"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001027"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000206"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000833"
+                "@value": "nrel00000237"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000197",
+        "@id": "urn:nrel_example/nrel00000694",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000197"
+                "@value": "nrel00000694"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000664",
+        "@id": "urn:nrel_example/nrel00000642",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "urn:nrel_example/nrel00000586"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000923"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000664"
+                "@value": "nrel00000642"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001109",
+        "@id": "urn:nrel_example/nrel00000260",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -17628,182 +17732,179 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001109"
+                "@value": "nrel00000260"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000889",
+        "@id": "urn:nrel_example/nrel00001328",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000889"
+                "@value": "nrel00001328"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000020",
+        "@id": "urn:nrel_example/nrel00000201",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000020"
+                "@value": "nrel00000201"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001200",
+        "@id": "urn:nrel_example/nrel00000051",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001200"
+                "@value": "nrel00000051"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000668",
+        "@id": "urn:nrel_example/nrel00000783",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000970"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000984"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000668"
+                "@value": "nrel00000783"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000124",
+        "@id": "urn:nrel_example/nrel00000228",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000124"
+                "@value": "nrel00000228"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000423",
+        "@id": "urn:nrel_example/nrel00000850",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000423"
+                "@value": "nrel00000850"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001042",
+        "@id": "urn:nrel_example/nrel00000610",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000530"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000834"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000606"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001124"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001042"
+                "@value": "nrel00000610"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000211",
+        "@id": "urn:nrel_example/nrel00000530",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000211"
+                "@value": "nrel00000530"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001285",
+        "@id": "urn:nrel_example/nrel00000270",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000207"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001285"
+                "@value": "nrel00000270"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000332",
+        "@id": "urn:nrel_example/nrel00001184",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -17819,48 +17920,51 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000332"
+                "@value": "nrel00001184"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000501",
+        "@id": "urn:nrel_example/nrel00000713",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000236"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001165"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000567"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000501"
+                "@value": "nrel00000713"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000517",
+        "@id": "urn:nrel_example/nrel00000468",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000307"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000618"
+                "@value": "nrel00000468"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000462",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -17869,65 +17973,54 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000517"
+                "@value": "nrel00000462"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000862",
+        "@id": "urn:nrel_example/nrel00000116",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000219"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000792"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000417"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001134"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000862"
+                "@value": "nrel00000116"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000614",
+        "@id": "urn:nrel_example/nrel00001326",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000614"
+                "@value": "nrel00001326"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000220",
+        "@id": "urn:nrel_example/nrel00000950",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -17938,78 +18031,98 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000220"
+                "@value": "nrel00000950"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000082",
+        "@id": "urn:nrel_example/nrel00000739",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000082"
+                "@value": "nrel00000739"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000955",
+        "@id": "urn:nrel_example/nrel00001126",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000955"
+                "@value": "nrel00001126"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001088",
+        "@id": "urn:nrel_example/nrel00001256",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000678"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001088"
+                "@value": "nrel00001256"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000786",
+        "@id": "urn:nrel_example/nrel00001313",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000786"
+                "@value": "nrel00001313"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000004",
+        "@id": "urn:nrel_example/nrel00000249",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -18018,181 +18131,228 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000004"
+                "@value": "nrel00000249"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000127",
+        "@id": "urn:nrel_example/nrel00000540",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000631"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000241"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001085"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000127"
+                "@value": "nrel00000540"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000537",
+        "@id": "urn:nrel_example/nrel00000867",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Zone"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasDomainSpace": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:nrel_example/nrel00000080"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:nrel_example/nrel00000122"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000587"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000600"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000631"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000736"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000862"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001125"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001197"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001267"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000537"
+                "@value": "nrel00000867"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000943",
+        "@id": "urn:nrel_example/nrel00000815",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:nrel_example/nrel00001033"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "urn:nrel_example/nrel00001229"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@value": "nrel00000943"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000161",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000762"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00001041"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000161"
+                "@value": "nrel00000815"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000177",
+        "@id": "urn:nrel_example/nrel00001039",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000177"
+                "@value": "nrel00001039"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000863",
+        "@id": "urn:nrel_example/nrel00001199",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000096"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001032"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000056"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000242"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000277"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000289"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000452"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000559"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000929"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001028"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001066"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001224"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000863"
+                "@value": "nrel00001199"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001138",
+        "@id": "urn:nrel_example/nrel00000311",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001138"
+                "@value": "nrel00000311"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000399",
+        "@id": "urn:nrel_example/nrel00000335",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000399"
+                "@value": "nrel00000335"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000393",
+        "@id": "urn:nrel_example/nrel00000239",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000393"
+                "@value": "nrel00000239"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000846",
+        "@id": "urn:nrel_example/nrel00000050",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -18203,90 +18363,70 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000846"
+                "@value": "nrel00000050"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000495",
+        "@id": "urn:nrel_example/nrel00000766",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000331"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001111"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000270"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000476"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000523"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000543"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000706"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000713"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000730"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000819"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000831"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001000"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001039"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000495"
+                "@value": "nrel00000766"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000995",
+        "@id": "urn:nrel_example/nrel00001285",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000131"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:nrel_example/nrel00000207"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001259"
+                "@value": "nrel00001285"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000598",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000995"
+                "@value": "nrel00000598"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000008",
+        "@id": "urn:nrel_example/nrel00000585",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -18302,43 +18442,41 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000008"
+                "@value": "nrel00000585"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000137",
+        "@id": "urn:nrel_example/nrel00000466",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000810"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000623"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000137"
+                "@value": "nrel00000466"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000397",
+        "@id": "urn:nrel_example/nrel00000011",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://www.w3.org/2002/07/owl#Ontology"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000255"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000908"
+                "@value": "nrel00000011"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001207",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -18347,348 +18485,311 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000397"
+                "@value": "nrel00001207"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000604",
+        "@id": "urn:nrel_example/nrel00001178",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001136"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001255"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000604"
+                "@value": "nrel00001178"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001029",
+        "@id": "urn:nrel_example/nrel00000891",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000388"
+                "@id": "urn:nrel_example/nrel00000158"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000577"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000673"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001029"
+                "@value": "nrel00000891"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001180",
+        "@id": "urn:nrel_example/nrel00001169",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000172"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000885"
-            },
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00001179"
+                "@id": "urn:nrel_example/nrel00000635"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001180"
+                "@value": "nrel00001169"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000268",
+        "@id": "urn:nrel_example/nrel00000794",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00001197"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00001121"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00001306"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000268"
+                "@value": "nrel00000794"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000899",
+        "@id": "urn:nrel_example/nrel00001292",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000875"
+                "@id": "urn:nrel_example/nrel00001300"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000147"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000899"
+                "@value": "nrel00001292"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000896",
+        "@id": "urn:nrel_example/nrel00000101",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001049"
+                "@id": "urn:nrel_example/nrel00000736"
             }
         ],
         "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000114"
+                "@id": "urn:nrel_example/nrel00000969"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000594"
+                "@id": "urn:nrel_example/nrel00001014"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000896"
+                "@value": "nrel00000101"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000062",
+        "@id": "urn:nrel_example/nrel00000741",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000514"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000913"
+                "@id": "urn:nrel_example/nrel00000463"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000601"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000793"
+                "@id": "urn:nrel_example/nrel00001307"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000062"
+                "@value": "nrel00000741"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000577",
+        "@id": "urn:nrel_example/nrel00000268",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000891"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000687"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000577"
+                "@value": "nrel00000268"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000509",
+        "@id": "urn:nrel_example/nrel00000130",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000380"
+            },
             {
-                "@value": "nrel00000509"
+                "@id": "urn:nrel_example/nrel00000579"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000261",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000261"
+                "@value": "nrel00000130"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001194",
+        "@id": "urn:nrel_example/nrel00000634",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001194"
+                "@value": "nrel00000634"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000805",
+        "@id": "urn:nrel_example/nrel00000511",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000805"
+                "@value": "nrel00000511"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000080",
+        "@id": "urn:nrel_example/nrel00000810",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000220"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001105"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000005"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000319"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000080"
+                "@value": "nrel00000810"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001145",
+        "@id": "urn:nrel_example/nrel00000499",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001145"
+                "@value": "nrel00000499"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001126",
+        "@id": "urn:nrel_example/nrel00000279",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001126"
+                "@value": "nrel00000279"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001256",
+        "@id": "urn:nrel_example/nrel00000813",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000678"
+                "@id": "urn:nrel_example/nrel00001107"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001302"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -18698,127 +18799,157 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001256"
+                "@value": "nrel00000813"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000516",
+        "@id": "urn:nrel_example/nrel00000284",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000516"
+                "@value": "nrel00000284"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000519",
+        "@id": "urn:nrel_example/nrel00000154",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000519"
+                "@value": "nrel00000154"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000667",
+        "@id": "urn:nrel_example/nrel00000734",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000207"
+                "@id": "urn:nrel_example/nrel00000075"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000443"
+                "@id": "urn:nrel_example/nrel00000740"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000667"
+                "@value": "nrel00000734"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001105",
+        "@id": "urn:nrel_example/nrel00000003",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000804"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001038"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001156"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000612"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000676"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000897"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000953"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000203"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000895"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001105"
+                "@value": "nrel00000003"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000434",
+        "@id": "urn:nrel_example/nrel00000884",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000434"
+                "@value": "nrel00000884"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001063",
+        "@id": "urn:nrel_example/nrel00000883",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001063"
+                "@value": "nrel00000883"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001219",
+        "@id": "urn:nrel_example/nrel00000586",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000462"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000924"
+                "@id": "urn:nrel_example/nrel00000642"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -18828,99 +18959,96 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001219"
+                "@value": "nrel00000586"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000374",
+        "@id": "urn:nrel_example/nrel00000141",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000001"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000219"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000374"
+                "@value": "nrel00000141"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001293",
+        "@id": "urn:nrel_example/nrel00001018",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001293"
+                "@value": "nrel00001018"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000141",
+        "@id": "urn:nrel_example/nrel00001281",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000141"
+                "@value": "nrel00001281"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001127",
+        "@id": "urn:nrel_example/nrel00000322",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "urn:nrel_example/nrel00001259"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "urn:nrel_example/nrel00000500"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00001168"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001127"
+                "@value": "nrel00000322"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001159",
+        "@id": "urn:nrel_example/nrel00000967",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -18931,38 +19059,49 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001159"
+                "@value": "nrel00000967"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000842",
+        "@id": "urn:nrel_example/nrel00001287",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000939"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000708"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001090"
+                "@value": "nrel00001287"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001271",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000842"
+                "@value": "nrel00001271"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001002",
+        "@id": "urn:nrel_example/nrel00000204",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -18978,167 +19117,145 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001002"
+                "@value": "nrel00000204"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000574",
+        "@id": "urn:nrel_example/nrel00001071",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001211"
+                "@id": "urn:nrel_example/nrel00000748"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001236"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000574"
+                "@value": "nrel00001071"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000934",
+        "@id": "urn:nrel_example/nrel00000806",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000153"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000302"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000653"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001249"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000934"
+                "@value": "nrel00000806"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000288",
+        "@id": "urn:nrel_example/nrel00000259",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000288"
+                "@value": "nrel00000259"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000433",
+        "@id": "urn:nrel_example/nrel00000242",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000433"
+                "@value": "nrel00000242"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001176",
+        "@id": "urn:nrel_example/nrel00001174",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#Fan"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000137"
-            },
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000561"
+                "@id": "urn:nrel_example/nrel00000588"
             },
             {
-                "@id": "urn:nrel_example/nrel00001095"
+                "@id": "urn:nrel_example/nrel00001294"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000625"
+                "@id": "urn:nrel_example/nrel00000020"
             },
             {
-                "@id": "urn:nrel_example/nrel00000668"
+                "@id": "urn:nrel_example/nrel00000029"
             },
             {
-                "@id": "urn:nrel_example/nrel00000810"
+                "@id": "urn:nrel_example/nrel00000257"
             },
             {
-                "@id": "urn:nrel_example/nrel00001102"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:nrel_example/nrel00000295"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000046"
+                "@id": "urn:nrel_example/nrel00000569"
             },
             {
-                "@id": "urn:nrel_example/nrel00000623"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000650"
+            },
             {
-                "@value": "nrel00001176"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000158",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+                "@id": "urn:nrel_example/nrel00000796"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000891"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000857"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000890"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001076"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001154"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000158"
+                "@value": "nrel00001174"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000436",
+        "@id": "urn:nrel_example/nrel00001227",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -19149,151 +19266,162 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000436"
+                "@value": "nrel00001227"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000607",
+        "@id": "urn:nrel_example/nrel00000736",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
+                "@id": "urn:nrel_example/nrel00000045"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000162"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00001014"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001295"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000607"
+                "@value": "nrel00000736"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000494",
+        "@id": "urn:nrel_example/nrel00000965",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001023"
+                "@id": "urn:nrel_example/nrel00000080"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000859"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000081"
+                "@id": "urn:nrel_example/nrel00000005"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000494"
+                "@value": "nrel00000965"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000897",
+        "@id": "urn:nrel_example/nrel00000425",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000897"
+                "@value": "nrel00000425"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000402",
+        "@id": "urn:nrel_example/nrel00000637",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000402"
+                "@value": "nrel00000637"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000394",
+        "@id": "urn:nrel_example/nrel00000150",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000394"
+                "@value": "nrel00000150"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000935",
+        "@id": "urn:nrel_example/nrel00001213",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000935"
+                "@value": "nrel00001213"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000289",
+        "@id": "urn:nrel_example/nrel00000146",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000289"
+                "@value": "nrel00000146"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000032",
+        "@id": "urn:nrel_example/nrel00000467",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -19302,207 +19430,244 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000032"
+                "@value": "nrel00000467"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000252",
+        "@id": "urn:nrel_example/nrel00000628",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000677"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001262"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000632"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000716"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000252"
+                "@value": "nrel00000628"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001186",
+        "@id": "urn:nrel_example/nrel00000224",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000074"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001208"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001186"
+                "@value": "nrel00000224"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000967",
+        "@id": "urn:nrel_example/nrel00000223",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000967"
+                "@value": "nrel00000223"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000410",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000410"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001288",
+        "@id": "urn:nrel_example/nrel00000188",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000249"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000596"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000694"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000700"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001288"
+                "@value": "nrel00000188"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000150",
+        "@id": "http://data.ashrae.org/standard223#EnumerationKind-Overridden",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
+            "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus",
+            "http://data.ashrae.org/standard223#EnumerationKind-Override"
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000150"
+                "@language": "en",
+                "@value": "AlarmStatus-Ok"
+            },
+            {
+                "@language": "en",
+                "@value": "Override-Overridden"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000018",
+        "@id": "urn:nrel_example/nrel00000906",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000827"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000852"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000422"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000855"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000018"
+                "@value": "nrel00000906"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000575",
+        "@id": "urn:nrel_example/nrel00000218",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000575"
+                "@value": "nrel00000218"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000529",
+        "@id": "urn:nrel_example/nrel00000440",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000529"
+                "@value": "nrel00000440"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000259",
+        "@id": "urn:nrel_example/nrel00001004",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "urn:nrel_example/nrel00000221"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "urn:nrel_example/nrel00000336"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000680"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000259"
+                "@value": "nrel00001004"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000039",
+        "@id": "urn:nrel_example/nrel00000379",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001226"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000933"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000039"
+                "@value": "nrel00000379"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000888",
+        "@id": "urn:nrel_example/nrel00000840",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -19511,128 +19676,167 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000888"
+                "@value": "nrel00000840"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001212",
+        "@id": "urn:nrel_example/nrel00000974",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001212"
+                "@value": "nrel00000974"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000343",
+        "@id": "urn:nrel_example/nrel00001052",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000134"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00000669"
+                "@id": "urn:nrel_example/nrel00000967"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000343"
+                "@value": "nrel00001052"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000063",
+        "@id": "urn:nrel_example/nrel00000288",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000063"
+                "@value": "nrel00000288"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000570",
+        "@id": "urn:nrel_example/nrel00001149",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:nrel_example/nrel00000742"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000570"
+                "@value": "nrel00001149"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000488",
+        "@id": "urn:nrel_example/nrel00000061",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#CoolingCoil"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000062"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001199"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000240"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000586"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000964"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001268"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000498"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000529"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000718"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001158"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001261"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000488"
+                "@value": "nrel00000061"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000890",
+        "@id": "urn:nrel_example/nrel00000920",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "urn:nrel_example/nrel00000638"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "urn:nrel_example/nrel00000412"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000890"
+                "@value": "nrel00000920"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000954",
+        "@id": "urn:nrel_example/nrel00001076",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -19643,44 +19847,36 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000954"
+                "@value": "nrel00001076"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001290",
+        "@id": "urn:nrel_example/nrel00000396",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000278"
+            },
             {
-                "@value": "nrel00001290"
+                "@id": "urn:nrel_example/nrel00000603"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000622",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000622"
+                "@value": "nrel00000396"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000845",
+        "@id": "urn:nrel_example/nrel00000125",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -19696,44 +19892,55 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000845"
+                "@value": "nrel00000125"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000941",
+        "@id": "urn:nrel_example/nrel00001304",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000251"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000846"
+                "@value": "nrel00001304"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000413",
+        "@type": [
+            "http://data.ashrae.org/standard223#Damper"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:nrel_example/nrel00000927"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000950"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000404"
+                "@id": "urn:nrel_example/nrel00000013"
             },
             {
-                "@id": "urn:nrel_example/nrel00000681"
+                "@id": "urn:nrel_example/nrel00000103"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000941"
+                "@value": "nrel00000413"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000345",
+        "@id": "urn:nrel_example/nrel00000048",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -19749,601 +19956,533 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000345"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000385",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
-            {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000385"
+                "@value": "nrel00000048"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000461",
+        "@id": "urn:nrel_example/nrel00000721",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001198"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000461"
+                "@value": "nrel00000721"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000563",
+        "@id": "urn:nrel_example/nrel00000718",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000563"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001074",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001074"
+                "@value": "nrel00000718"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000973",
+        "@id": "urn:nrel_example/nrel00000954",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000973"
+                "@value": "nrel00000954"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000325",
+        "@id": "urn:nrel_example/nrel00000689",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000325"
+                "@value": "nrel00000689"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000415",
+        "@id": "urn:nrel_example/nrel00000452",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000415"
+                "@value": "nrel00000452"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000587",
+        "@id": "urn:nrel_example/nrel00000486",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000745"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000986"
+                "@id": "urn:nrel_example/nrel00001125"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "urn:nrel_example/nrel00000500"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000433"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000844"
+                "@id": "urn:nrel_example/nrel00001280"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000587"
+                "@value": "nrel00000486"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000688",
+        "@id": "urn:nrel_example/nrel00000582",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001040"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000571"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000688"
+                "@value": "nrel00000582"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000450",
+        "@id": "urn:nrel_example/nrel00000670",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000450"
+                "@value": "nrel00000670"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001174",
+        "@id": "urn:nrel_example/nrel00001129",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000588"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001294"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000020"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000029"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000257"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000295"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000569"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000650"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000796"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000857"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000890"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001076"
-            },
+                "@value": "nrel00001129"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000880",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001154"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001174"
+                "@value": "nrel00000880"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000960",
+        "@id": "urn:nrel_example/nrel00001187",
         "@type": [
-            "http://data.ashrae.org/standard223#TerminalUnit"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000192"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000494"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000531"
+                "@id": "urn:nrel_example/nrel00000733"
             },
             {
-                "@id": "urn:nrel_example/nrel00000747"
+                "@id": "urn:nrel_example/nrel00001181"
             },
             {
-                "@id": "urn:nrel_example/nrel00001008"
+                "@id": "urn:nrel_example/nrel00001205"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000635"
+                "@id": "urn:nrel_example/nrel00000504"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000595"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000705"
             },
             {
-                "@id": "urn:nrel_example/nrel00001023"
+                "@id": "urn:nrel_example/nrel00000737"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000081"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000710"
+                "@id": "urn:nrel_example/nrel00000263"
             },
             {
-                "@id": "urn:nrel_example/nrel00001138"
+                "@id": "urn:nrel_example/nrel00000915"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000960"
+                "@value": "nrel00001187"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000900",
+        "@id": "urn:nrel_example/nrel00000296",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000900"
+                "@value": "nrel00000296"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000276",
+        "@id": "urn:nrel_example/nrel00001024",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "urn:nrel_example/nrel00000208"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000947"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000276"
+                "@value": "nrel00001024"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000133",
+        "@id": "urn:nrel_example/nrel00001300",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000432"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001235"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000133"
+                "@value": "nrel00001300"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000827",
+        "@id": "urn:nrel_example/nrel00000195",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000827"
+                "@value": "nrel00000195"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000348",
+        "@id": "urn:nrel_example/nrel00001137",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000348"
+                "@value": "nrel00001137"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000130",
+        "@id": "urn:nrel_example/nrel00000362",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#FanCoilUnit"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000380"
+                "@id": "urn:nrel_example/nrel00000830"
             },
             {
-                "@id": "urn:nrel_example/nrel00000579"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000839"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001176"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000130"
+                "@id": "urn:nrel_example/nrel00000714"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001020"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000980",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "urn:nrel_example/nrel00000527"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000643"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000812"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001065"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001082"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+            },
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000980"
+                "@value": "nrel00000362"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000260",
+        "@id": "urn:nrel_example/nrel00000566",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000260"
+                "@value": "nrel00000566"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001185",
+        "@id": "urn:nrel_example/nrel00000460",
         "@type": [
-            "http://data.ashrae.org/standard223#TerminalUnit"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000414"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000533"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000667"
+                "@id": "urn:nrel_example/nrel00000300"
             },
             {
-                "@id": "urn:nrel_example/nrel00000755"
+                "@id": "urn:nrel_example/nrel00000817"
             },
             {
-                "@id": "urn:nrel_example/nrel00001329"
+                "@id": "urn:nrel_example/nrel00001162"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000207"
+                "@id": "urn:nrel_example/nrel00000065"
             },
             {
-                "@id": "urn:nrel_example/nrel00000864"
+                "@id": "urn:nrel_example/nrel00001050"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001072"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001107"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000443"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000709"
+                "@id": "urn:nrel_example/nrel00000518"
             },
             {
-                "@id": "urn:nrel_example/nrel00001163"
+                "@id": "urn:nrel_example/nrel00000684"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001185"
+                "@value": "nrel00000460"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001033",
+        "@id": "urn:nrel_example/nrel00000436",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001123"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001033"
+                "@value": "nrel00000436"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001151",
+        "@id": "urn:nrel_example/nrel00000234",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001151"
+                "@value": "nrel00000234"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000559",
+        "@id": "urn:nrel_example/nrel00000087",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000559"
+                "@value": "nrel00000087"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000927",
+        "@id": "urn:nrel_example/nrel00000159",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000927"
+                "@value": "nrel00000159"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000685",
+        "@id": "urn:nrel_example/nrel00000318",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -20354,33 +20493,28 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000685"
+                "@value": "nrel00000318"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000311",
+        "@id": "urn:nrel_example/nrel00000451",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000311"
+                "@value": "nrel00000451"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001047",
+        "@id": "urn:nrel_example/nrel00000705",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -20391,30 +20525,43 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001047"
+                "@value": "nrel00000705"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000403",
+        "@id": "urn:nrel_example/nrel00001245",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000403"
+                "@value": "nrel00001245"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000186",
+        "@id": "urn:nrel_example/nrel00000022",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000190"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000366"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -20423,35 +20570,35 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000186"
+                "@value": "nrel00000022"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001179",
+        "@id": "urn:nrel_example/nrel00000310",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001179"
+                "@value": "nrel00000310"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000089",
+        "@id": "urn:nrel_example/nrel00001230",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -20465,119 +20612,99 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000089"
+                "@value": "nrel00001230"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001065",
+        "@id": "urn:nrel_example/nrel00000380",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001065"
+                "@value": "nrel00000380"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000277",
+        "@id": "urn:nrel_example/nrel00000463",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000277"
+                "@value": "nrel00000463"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000946",
+        "@id": "urn:nrel_example/nrel00000570",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000946"
+                "@value": "nrel00000570"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001169",
+        "@id": "urn:nrel_example/nrel00001203",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:nrel_example/nrel00000635"
-            }
-        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001169"
+                "@value": "nrel00001203"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000478",
+        "@id": "urn:nrel_example/nrel00000693",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000474"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000708"
+                "@id": "urn:nrel_example/nrel00001194"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000345"
+                "@id": "urn:nrel_example/nrel00000373"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000478"
+                "@value": "nrel00000693"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000699",
+        "@id": "urn:nrel_example/nrel00000776",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000535"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -20586,81 +20713,60 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000699"
+                "@value": "nrel00000776"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001223",
+        "@id": "urn:nrel_example/nrel00000841",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000786"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001149"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000363"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000489"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001223"
+                "@value": "nrel00000841"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000153",
+        "@id": "urn:nrel_example/nrel00001260",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000153"
+                "@value": "nrel00001260"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001296",
+        "@id": "urn:nrel_example/nrel00000314",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001200"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000241"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000274"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001296"
+                "@value": "nrel00000314"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000526",
+        "@id": "urn:nrel_example/nrel00000712",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -20671,204 +20777,243 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000526"
+                "@value": "nrel00000712"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000263",
+        "@id": "urn:nrel_example/nrel00001253",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000263"
+                "@value": "nrel00001253"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001025",
+        "@id": "urn:nrel_example/nrel00001165",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001267"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000567"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000637"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001025"
+                "@value": "nrel00001165"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000114",
+        "@id": "urn:nrel_example/nrel00000982",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#AirHandlingUnit"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000600"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:nrel_example/nrel00000007"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000477"
+                "@id": "urn:nrel_example/nrel00000053"
             },
             {
-                "@id": "urn:nrel_example/nrel00000594"
+                "@id": "urn:nrel_example/nrel00000061"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000254"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000446"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000447"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000683"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000992"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001087"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000114"
+                "@id": "urn:nrel_example/nrel00000078"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000211"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001058",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00000034"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001070"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001058"
+                "@value": "nrel00000982"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000278",
+        "@id": "urn:nrel_example/nrel00000111",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000278"
+                "@value": "nrel00000111"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001142",
+        "@id": "urn:nrel_example/nrel00001318",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000266"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000472"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000934"
+                "@id": "urn:nrel_example/nrel00000122"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000104"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000620"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001141"
-            },
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001241"
+                "@id": "urn:nrel_example/nrel00001027"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000256"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000260"
+                "@id": "urn:nrel_example/nrel00000335"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001142"
+                "@value": "nrel00001318"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000959",
+        "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Class",
+            "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus",
+            "http://www.w3.org/ns/shacl#NodeShape"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@value": "EnumerationKind FlowStatus"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://www.w3.org/2000/01/rdf-schema#subClassOf": [
             {
-                "@value": "nrel00000959"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000048",
+        "@id": "urn:nrel_example/nrel00000072",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000048"
+                "@value": "nrel00000072"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001160",
+        "@id": "urn:nrel_example/nrel00000090",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "urn:nrel_example/nrel00000466"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00001121"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000068"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001160"
+                "@value": "nrel00000090"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000975",
+        "@id": "urn:nrel_example/nrel00000325",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000325"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000305",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -20877,221 +21022,253 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000975"
+                "@value": "nrel00000305"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000029",
+        "@id": "urn:nrel_example/nrel00000054",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000029"
+                "@value": "nrel00000054"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000059",
+        "@id": "urn:nrel_example/nrel00001180",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000172"
+            }
+        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000885"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001179"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000059"
+                "@value": "nrel00001180"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000838",
+        "@id": "urn:nrel_example/nrel00000403",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000399"
-            },
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000714"
+                "@value": "nrel00000403"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000671",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000838"
+                "@value": "nrel00000671"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000599",
+        "@id": "urn:nrel_example/nrel00000818",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000221"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001086"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000739"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001130"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000599"
+                "@value": "nrel00000818"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001201",
+        "@id": "urn:nrel_example/nrel00000152",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000354"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000823"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001201"
+                "@value": "nrel00000152"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000440",
+        "@id": "urn:nrel_example/nrel00000165",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000440"
+                "@value": "nrel00000165"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000391",
+        "@id": "urn:nrel_example/nrel00000261",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000391"
+                "@value": "nrel00000261"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000964",
+        "@id": "urn:nrel_example/nrel00001117",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000964"
+                "@value": "nrel00001117"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000417",
+        "@id": "urn:nrel_example/nrel00000873",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000417"
+                "@value": "nrel00000873"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001188",
+        "@id": "urn:nrel_example/nrel00000728",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001188"
+                "@value": "nrel00000728"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000384",
+        "@id": "urn:nrel_example/nrel00000599",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000384"
+                "@value": "nrel00000599"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000558",
+        "@id": "urn:nrel_example/nrel00001215",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -21102,80 +21279,70 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000558"
+                "@value": "nrel00001215"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000180",
+        "@id": "urn:nrel_example/nrel00000892",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "urn:nrel_example/nrel00000077"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000180"
+                "@value": "nrel00000892"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001317",
+        "@id": "urn:nrel_example/nrel00001086",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001317"
+                "@value": "nrel00001086"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000155",
+        "@id": "urn:nrel_example/nrel00000823",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000862"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000464"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000417"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000155"
+                "@value": "nrel00000823"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001082",
+        "@id": "urn:nrel_example/nrel00001306",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -21191,135 +21358,103 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001082"
+                "@value": "nrel00001306"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000016",
+        "@id": "urn:nrel_example/nrel00000493",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000587"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@value": "nrel00000016"
+                "@id": "urn:nrel_example/nrel00000160"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000120",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000844"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000120"
+                "@value": "nrel00000493"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001059",
+        "@id": "urn:nrel_example/nrel00000919",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "urn:nrel_example/nrel00000026"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "urn:nrel_example/nrel00000094"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001059"
+                "@value": "nrel00000919"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000549",
+        "@id": "urn:nrel_example/nrel00001272",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000050"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000760"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000549"
+                "@value": "nrel00001272"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000460",
+        "@id": "urn:nrel_example/nrel00000402",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000300"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000817"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001162"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000065"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001050"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001072"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001107"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000518"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000684"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000460"
+                "@value": "nrel00000402"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001270",
+        "@id": "urn:nrel_example/nrel00000138",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -21328,89 +21463,80 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001270"
+                "@value": "nrel00000138"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000865",
+        "@id": "urn:nrel_example/nrel00001167",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000865"
+                "@value": "nrel00001167"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000321",
+        "@id": "urn:nrel_example/nrel00000646",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "nrel00000321"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001251",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001251"
+                "@value": "nrel00000646"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000891",
+        "@id": "urn:nrel_example/nrel00000127",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000158"
-            },
+                "@id": "urn:nrel_example/nrel00000631"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000577"
+                "@id": "urn:nrel_example/nrel00000241"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001085"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000891"
+                "@value": "nrel00000127"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001141",
+        "@id": "urn:nrel_example/nrel00000897",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -21421,130 +21547,115 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001141"
+                "@value": "nrel00000897"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000672",
+        "@id": "urn:nrel_example/nrel00001286",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000672"
+                "@value": "nrel00001286"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000586",
+        "@id": "urn:nrel_example/nrel00000031",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000642"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000840"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000858"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@value": "nrel00000586"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000023",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+                "@id": "urn:nrel_example/nrel00000268"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00000598"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000023"
+                "@value": "nrel00000031"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000940",
+        "@id": "urn:nrel_example/nrel00001316",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:nrel_example/nrel00000050"
-            }
-        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000940"
+                "@value": "nrel00001316"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000737",
+        "@id": "urn:nrel_example/nrel00000240",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000589"
+            }
+        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000737"
+                "@value": "nrel00000240"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000835",
+        "@id": "urn:nrel_example/nrel00000286",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000835"
+                "@value": "nrel00000286"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000302",
+        "@id": "urn:nrel_example/nrel00001241",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -21553,163 +21664,121 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000302"
+                "@value": "nrel00001241"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000458",
+        "@id": "urn:nrel_example/nrel00001061",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000458"
+                "@value": "nrel00001061"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000661",
+        "@id": "urn:nrel_example/nrel00000565",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000661"
+                "@value": "nrel00000565"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000312",
+        "@id": "urn:nrel_example/nrel00000344",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#Pump"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000869"
+                "@id": "urn:nrel_example/nrel00000944"
             },
             {
-                "@id": "urn:nrel_example/nrel00001228"
+                "@id": "urn:nrel_example/nrel00001210"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000047"
+                "@id": "urn:nrel_example/nrel00000145"
             },
             {
-                "@id": "urn:nrel_example/nrel00000196"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000312"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000084",
-        "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000133"
+                "@id": "urn:nrel_example/nrel00000170"
             },
             {
-                "@id": "urn:nrel_example/nrel00000593"
+                "@id": "urn:nrel_example/nrel00000174"
             },
             {
-                "@id": "urn:nrel_example/nrel00000772"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+                "@id": "urn:nrel_example/nrel00000384"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000151"
+                "@id": "urn:nrel_example/nrel00000456"
             },
             {
-                "@id": "urn:nrel_example/nrel00000167"
+                "@id": "urn:nrel_example/nrel00000468"
             },
             {
-                "@id": "urn:nrel_example/nrel00000432"
+                "@id": "urn:nrel_example/nrel00000937"
             },
             {
-                "@id": "urn:nrel_example/nrel00000991"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+                "@id": "urn:nrel_example/nrel00001081"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000978"
+                "@id": "urn:nrel_example/nrel00001120"
             },
             {
-                "@id": "urn:nrel_example/nrel00001235"
+                "@id": "urn:nrel_example/nrel00001246"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000084"
+                "@value": "nrel00000344"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000649",
+        "@id": "urn:nrel_example/nrel00000796",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000364"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000516"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000893"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001139"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasDomain": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000182"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001178"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000649"
+                "@value": "nrel00000796"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000760",
+        "@id": "urn:nrel_example/nrel00000704",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -21720,141 +21789,164 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000760"
+                "@value": "nrel00000704"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000711",
+        "@id": "urn:nrel_example/nrel00000899",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000875"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000711"
+                "@value": "nrel00000899"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001246",
+        "@id": "urn:nrel_example/nrel00001113",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Junction"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+                "@id": "urn:nrel_example/nrel00000043"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000790"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000802"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000841"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001182"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001203"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001242"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001246"
+                "@value": "nrel00001113"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001298",
+        "@id": "urn:nrel_example/nrel00000970",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001298"
+                "@value": "nrel00000970"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000530",
+        "@id": "urn:nrel_example/nrel00001153",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000530"
+                "@value": "nrel00001153"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000224",
+        "@id": "urn:nrel_example/nrel00000983",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000224"
+                "@value": "nrel00000983"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000162",
+        "@id": "urn:nrel_example/nrel00000173",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000162"
+                "@value": "nrel00000173"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000850",
+        "@id": "urn:nrel_example/nrel00000142",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000948"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000641"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000850"
+                "@value": "nrel00000142"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000814",
+        "@id": "urn:nrel_example/nrel00000894",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -21863,168 +21955,190 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000814"
+                "@value": "nrel00000894"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000281",
+        "@id": "urn:nrel_example/nrel00000182",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000281"
+                "@value": "nrel00000182"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001106",
+        "@id": "urn:nrel_example/nrel00000911",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
+                "@id": "urn:nrel_example/nrel00000869"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001183"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001106"
+                "@value": "nrel00000911"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000572",
+        "@id": "urn:nrel_example/nrel00000635",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000572"
+                "@value": "nrel00000635"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001028",
+        "@id": "urn:nrel_example/nrel00000681",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001028"
+                "@value": "nrel00000681"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000750",
+        "@id": "urn:nrel_example/nrel00000253",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000750"
+                "@value": "nrel00000253"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000355",
+        "@id": "urn:nrel_example/nrel00000854",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000781"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00001027"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000537"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000355"
+                "@value": "nrel00000854"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000961",
+        "@id": "urn:nrel_example/nrel00001083",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000961"
+                "@value": "nrel00001083"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000736",
+        "@id": "urn:nrel_example/nrel00000923",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000045"
-            },
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000162"
+                "@id": "urn:nrel_example/nrel00000642"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00001014"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001295"
+                "@id": "urn:nrel_example/nrel00000067"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000736"
+                "@value": "nrel00000923"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001157",
+        "@id": "urn:nrel_example/nrel00001323",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -22033,14 +22147,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001157"
+                "@value": "nrel00001323"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001193",
+        "@id": "urn:nrel_example/nrel00000508",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -22049,87 +22163,84 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001193"
+                "@value": "nrel00000508"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001087",
+        "@id": "urn:nrel_example/nrel00000527",
         "@type": [
-            "http://data.ashrae.org/standard223#Filter"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000107"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000908"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001213"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001087"
+                "@value": "nrel00000527"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000743",
+        "@id": "urn:nrel_example/nrel00000887",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "urn:nrel_example/nrel00001311"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "urn:nrel_example/nrel00000575"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000743"
+                "@value": "nrel00000887"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000562",
+        "@id": "urn:nrel_example/nrel00000144",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000562"
+                "@value": "nrel00000144"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000615",
+        "@id": "urn:nrel_example/nrel00000397",
         "@type": [
             "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000281"
+                "@id": "urn:nrel_example/nrel00000255"
             },
             {
-                "@id": "urn:nrel_example/nrel00000354"
+                "@id": "urn:nrel_example/nrel00000908"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -22139,304 +22250,297 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000615"
+                "@value": "nrel00000397"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000603",
+        "@id": "urn:nrel_example/nrel00000352",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000603"
+                "@value": "nrel00000352"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001258",
+        "@id": "urn:nrel_example/nrel00000071",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000120"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000415"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000349"
-            },
+                "@value": "nrel00000071"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001003",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000644"
+                "@id": "urn:nrel_example/nrel00000050"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000853"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001258"
+                "@value": "nrel00001003"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000477",
+        "@id": "urn:nrel_example/nrel00000688",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000688"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000342",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:nrel_example/nrel00000967"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:nrel_example/nrel00001221"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000477"
+                "@value": "nrel00000342"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000533",
+        "@id": "urn:nrel_example/nrel00001119",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#Fan"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000188"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000418"
+                "@id": "urn:nrel_example/nrel00000703"
             },
             {
-                "@id": "urn:nrel_example/nrel00001012"
+                "@id": "urn:nrel_example/nrel00001078"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000485"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000579"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001285"
+                "@id": "urn:nrel_example/nrel00000406"
             },
             {
-                "@id": "urn:nrel_example/nrel00001299"
+                "@id": "urn:nrel_example/nrel00001077"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000166"
+                "@id": "urn:nrel_example/nrel00000072"
             },
             {
-                "@id": "urn:nrel_example/nrel00000457"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000533"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000216",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000116"
+            },
             {
-                "@value": "nrel00000216"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001113",
-        "@type": [
-            "http://data.ashrae.org/standard223#Junction"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+                "@id": "urn:nrel_example/nrel00000126"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000043"
+                "@id": "urn:nrel_example/nrel00000164"
             },
             {
-                "@id": "urn:nrel_example/nrel00000790"
+                "@id": "urn:nrel_example/nrel00000272"
             },
             {
-                "@id": "urn:nrel_example/nrel00000802"
+                "@id": "urn:nrel_example/nrel00000401"
             },
             {
-                "@id": "urn:nrel_example/nrel00000841"
+                "@id": "urn:nrel_example/nrel00000558"
             },
             {
-                "@id": "urn:nrel_example/nrel00001182"
+                "@id": "urn:nrel_example/nrel00000616"
             },
             {
-                "@id": "urn:nrel_example/nrel00001203"
+                "@id": "urn:nrel_example/nrel00000670"
             },
             {
-                "@id": "urn:nrel_example/nrel00001242"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000935"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001127"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001113"
+                "@value": "nrel00001119"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000991",
+        "@id": "urn:nrel_example/nrel00001190",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000389"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001194"
+                "@id": "urn:nrel_example/nrel00000968"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000991"
+                "@value": "nrel00001190"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000219",
+        "@id": "urn:nrel_example/nrel00000021",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000339"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@value": "nrel00000219"
+                "@id": "urn:nrel_example/nrel00001165"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000096",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000637"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000096"
+                "@value": "nrel00000021"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001310",
+        "@id": "urn:nrel_example/nrel00001158",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001310"
+                "@value": "nrel00001158"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001078",
+        "@id": "urn:nrel_example/nrel00001244",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001077"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000272"
+                "@value": "nrel00001244"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001331",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+        ],
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+            {
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001078"
+                "@value": "nrel00001331"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000413",
+        "@id": "urn:nrel_example/nrel00001151",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000927"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000950"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000013"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000103"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000413"
+                "@value": "nrel00001151"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000619",
+        "@id": "urn:nrel_example/nrel00000971",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -22445,96 +22549,96 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000619"
+                "@value": "nrel00000971"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000521",
+        "@id": "urn:nrel_example/nrel00000121",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:nrel_example/nrel00000354"
+                "@id": "urn:nrel_example/nrel00000941"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000139"
+                "@id": "urn:nrel_example/nrel00000071"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000576"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000521"
+                "@value": "nrel00000121"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001328",
+        "@id": "urn:nrel_example/nrel00000625",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001328"
+                "@value": "nrel00000625"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000353",
+        "@id": "urn:nrel_example/nrel00000559",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000353"
+                "@value": "nrel00000559"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000284",
+        "@id": "urn:nrel_example/nrel00001078",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:nrel_example/nrel00001077"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:nrel_example/nrel00000272"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000284"
+                "@value": "nrel00001078"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000822",
-        "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000355"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000438"
-            }
+        "@id": "urn:nrel_example/nrel00000131",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -22543,22 +22647,14 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000822"
+                "@value": "nrel00000131"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000346",
+        "@id": "urn:nrel_example/nrel00001294",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000439"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000873"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -22567,133 +22663,134 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000346"
+                "@value": "nrel00001294"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000686",
+        "@id": "urn:nrel_example/nrel00001150",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000967"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000176"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000686"
+                "@value": "nrel00001150"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000304",
+        "@id": "urn:nrel_example/nrel00000372",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+                "@id": "urn:nrel_example/nrel00000893"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "urn:nrel_example/nrel00000553"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000930"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000304"
+                "@value": "nrel00000372"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000351",
+        "@id": "urn:nrel_example/nrel00000507",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000172"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000351"
+                "@value": "nrel00000507"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001175",
+        "@id": "urn:nrel_example/nrel00000083",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+                "@id": "urn:nrel_example/nrel00000437"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001104"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "urn:nrel_example/nrel00001026"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001252"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001175"
+                "@value": "nrel00000083"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000481",
+        "@id": "urn:nrel_example/nrel00000104",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000481"
+                "@value": "nrel00000104"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000091",
+        "@id": "urn:nrel_example/nrel00000489",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000091"
+                "@value": "nrel00000489"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000518",
+        "@id": "urn:nrel_example/nrel00001236",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -22709,223 +22806,186 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000518"
+                "@value": "nrel00001236"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000589",
+        "@id": "urn:nrel_example/nrel00000513",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000240"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000903"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000589"
+                "@value": "nrel00000513"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001119",
+        "@id": "urn:nrel_example/nrel00000909",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000703"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001078"
+                "@id": "urn:nrel_example/nrel00000658"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000406"
-            },
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001077"
+                "@id": "urn:nrel_example/nrel00000282"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000072"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000116"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000126"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000164"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000272"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000401"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000558"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000616"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000670"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000935"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001127"
+                "@id": "urn:nrel_example/nrel00000091"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001119"
+                "@value": "nrel00000909"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000644",
+        "@id": "urn:nrel_example/nrel00000913",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000644"
+                "@value": "nrel00000913"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001165",
+        "@id": "urn:nrel_example/nrel00000203",
         "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#encloses": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001267"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000567"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000637"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001165"
+                "@value": "nrel00000203"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000427",
+        "@id": "urn:nrel_example/nrel00000177",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000427"
+                "@value": "nrel00000177"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000416",
+        "@id": "urn:nrel_example/nrel00000386",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000287"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000467"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000314"
-            },
+                "@value": "nrel00000386"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000619",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000391"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000416"
+                "@value": "nrel00000619"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001217",
+        "@id": "urn:nrel_example/nrel00001173",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+            }
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001217"
+                "@value": "nrel00001173"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000334",
+        "@id": "urn:nrel_example/nrel00000044",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000587"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000160"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000433"
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000334"
+                "@value": "nrel00000044"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000556",
+        "@id": "urn:nrel_example/nrel00000085",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -22941,449 +23001,473 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000556"
+                "@value": "nrel00000085"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001228",
+        "@id": "urn:nrel_example/nrel00001131",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000941"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000227"
+                "@id": "urn:nrel_example/nrel00000121"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000681"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001228"
+                "@value": "nrel00001131"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000298",
+        "@id": "urn:nrel_example/nrel00000437",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000437"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001148",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000298"
+                "@value": "nrel00001148"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000189",
+        "@id": "urn:nrel_example/nrel00000932",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000163"
+                "@id": "urn:nrel_example/nrel00000207"
             },
             {
-                "@id": "urn:nrel_example/nrel00001094"
+                "@id": "urn:nrel_example/nrel00001086"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000211"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000189"
+                "@value": "nrel00000932"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001286",
+        "@id": "urn:nrel_example/nrel00001310",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001286"
+                "@value": "nrel00001310"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000942",
+        "@id": "urn:nrel_example/nrel00000153",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000942"
+                "@value": "nrel00000153"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000462",
+        "@id": "urn:nrel_example/nrel00001005",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000462"
+                "@value": "nrel00001005"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001189",
+        "@id": "urn:nrel_example/nrel00000999",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001189"
+                "@value": "nrel00000999"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000515",
+        "@id": "urn:nrel_example/nrel00000212",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000745"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000160"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001286"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000515"
+                "@value": "nrel00000212"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000262",
+        "@id": "urn:nrel_example/nrel00000226",
         "@type": [
-            "http://data.ashrae.org/standard223#FanCoilUnit"
+            "http://data.ashrae.org/standard223#CoolingCoil"
         ],
         "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000035"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000505"
+                "@id": "urn:nrel_example/nrel00000031"
             },
             {
-                "@id": "urn:nrel_example/nrel00000729"
+                "@id": "urn:nrel_example/nrel00000371"
             }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000597"
+                "@id": "urn:nrel_example/nrel00000063"
             },
             {
-                "@id": "urn:nrel_example/nrel00000724"
+                "@id": "urn:nrel_example/nrel00000269"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000663"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001316"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000070"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000405"
+                "@id": "urn:nrel_example/nrel00000204"
             },
             {
-                "@id": "urn:nrel_example/nrel00000551"
+                "@id": "urn:nrel_example/nrel00000213"
             },
             {
-                "@id": "urn:nrel_example/nrel00000980"
+                "@id": "urn:nrel_example/nrel00000557"
             },
             {
-                "@id": "urn:nrel_example/nrel00001011"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasRole": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+                "@id": "urn:nrel_example/nrel00000803"
             },
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "urn:nrel_example/nrel00001293"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000262"
+                "@value": "nrel00000226"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000855",
+        "@id": "urn:nrel_example/nrel00000171",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000098"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001207"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000855"
+                "@value": "nrel00000171"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000499",
+        "@id": "urn:nrel_example/nrel00000338",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000499"
+                "@value": "nrel00000338"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000307",
+        "@id": "urn:nrel_example/nrel00000836",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000517"
-            }
-        ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000307"
+                "@value": "nrel00000836"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000463",
+        "@id": "urn:nrel_example/nrel00000465",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000463"
+                "@value": "nrel00000465"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000734",
+        "@id": "urn:nrel_example/nrel00000624",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000075"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000740"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000734"
+                "@value": "nrel00000624"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000033",
+        "@id": "urn:nrel_example/nrel00001011",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000033"
+                "@value": "nrel00001011"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000921",
+        "@id": "urn:nrel_example/nrel00000028",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000921"
+                "@value": "nrel00000028"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000531",
+        "@id": "urn:nrel_example/nrel00000323",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001023"
+                "@id": "urn:nrel_example/nrel00000631"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000241"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001138"
+                "@id": "urn:nrel_example/nrel00000665"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000531"
+                "@value": "nrel00000323"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000228",
+        "@id": "urn:nrel_example/nrel00000843",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000228"
+                "@value": "nrel00000843"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000383",
+        "@id": "urn:nrel_example/nrel00001171",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000430"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000795"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000383"
+                "@value": "nrel00001171"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000773",
+        "@id": "urn:nrel_example/nrel00000698",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000773"
+                "@value": "nrel00000698"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000681",
+        "@id": "urn:nrel_example/nrel00000442",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -23399,92 +23483,117 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000681"
+                "@value": "nrel00000442"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000593",
+        "@id": "urn:nrel_example/nrel00000435",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#TerminalUnit"
+        ],
+        "http://data.ashrae.org/standard223#contains": [
+            {
+                "@id": "urn:nrel_example/nrel00000110"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000142"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000460"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000849"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000917"
+            }
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000087"
+                "@id": "urn:nrel_example/nrel00000462"
             },
             {
-                "@id": "urn:nrel_example/nrel00000434"
+                "@id": "urn:nrel_example/nrel00000948"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000301"
+                "@id": "urn:nrel_example/nrel00000048"
             },
             {
-                "@id": "urn:nrel_example/nrel00001215"
+                "@id": "urn:nrel_example/nrel00000124"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000641"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000593"
+                "@value": "nrel00000435"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000641",
+        "@id": "urn:nrel_example/nrel00000222",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000641"
+                "@value": "nrel00000222"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000621",
+        "@id": "urn:nrel_example/nrel00001066",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000621"
+                "@value": "nrel00001066"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000134",
+        "@id": "urn:nrel_example/nrel00000137",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000810"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000623"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000134"
+                "@value": "nrel00000137"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001155",
+        "@id": "urn:nrel_example/nrel00000521",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
@@ -23495,221 +23604,233 @@
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000985"
+                "@id": "urn:nrel_example/nrel00000139"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001155"
+                "@value": "nrel00000521"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001276",
+        "@id": "urn:nrel_example/nrel00001216",
         "@type": [
-            "http://data.ashrae.org/standard223#FanCoilUnit"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000757"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000777"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001142"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000100"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000873"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000141"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000382"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000711"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000765"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000959"
+                "@value": "nrel00001216"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000543",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001276"
+                "@value": "nrel00000543"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000011",
+        "@id": "urn:nrel_example/nrel00000364",
         "@type": [
-            "http://www.w3.org/2002/07/owl#Ontology"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000011"
+                "@value": "nrel00000364"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001137",
+        "@id": "urn:nrel_example/nrel00000985",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001137"
+                "@value": "nrel00000985"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000356",
+        "@id": "urn:nrel_example/nrel00000835",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000356"
+                "@value": "nrel00000835"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000663",
+        "@id": "urn:nrel_example/nrel00001221",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000663"
+                "@value": "nrel00001221"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001213",
+        "@id": "urn:nrel_example/nrel00000092",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "urn:nrel_example/nrel00000017"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "urn:nrel_example/nrel00000275"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001213"
+                "@value": "nrel00000092"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000540",
+        "@id": "urn:nrel_example/nrel00001212",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000540"
+                "@value": "nrel00001212"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000692",
+        "@id": "urn:nrel_example/nrel00000156",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000692"
+                "@value": "nrel00000156"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001241",
+        "@id": "urn:nrel_example/nrel00000802",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001241"
+                "@value": "nrel00000802"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001104",
+        "@id": "urn:nrel_example/nrel00000781",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001104"
+                "@value": "nrel00000781"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000738",
+        "@id": "urn:nrel_example/nrel00000175",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -23725,284 +23846,301 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000738"
+                "@value": "nrel00000175"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000715",
+        "@id": "urn:nrel_example/nrel00000231",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000715"
+                "@value": "nrel00000231"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001195",
+        "@id": "urn:nrel_example/nrel00000500",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000798"
-            },
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:nrel_example/nrel00000888"
+                "@id": "urn:nrel_example/nrel00001125"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000910"
+                "@id": "urn:nrel_example/nrel00000216"
             },
             {
-                "@id": "urn:nrel_example/nrel00001227"
+                "@id": "urn:nrel_example/nrel00001168"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001195"
+                "@value": "nrel00000500"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000483",
+        "@id": "urn:nrel_example/nrel00000853",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000862"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000464"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001134"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000483"
+                "@value": "nrel00000853"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000118",
+        "@id": "urn:nrel_example/nrel00000847",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000118"
+                "@value": "nrel00000847"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000067",
+        "@id": "urn:nrel_example/nrel00000458",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000067"
+                "@value": "nrel00000458"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001202",
+        "@id": "urn:nrel_example/nrel00000480",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000220"
+            },
             {
-                "@value": "nrel00001202"
+                "@id": "urn:nrel_example/nrel00000420"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001274",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:nrel_example/nrel00000078"
-            }
-        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001274"
+                "@value": "nrel00000480"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000309",
+        "@id": "urn:nrel_example/nrel00000782",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000000"
+                "@id": "urn:nrel_example/nrel00000148"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000647"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001037"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00001220"
+                "@id": "urn:nrel_example/nrel00000190"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000722"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001046"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001052"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000820"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001067"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000309"
+                "@value": "nrel00000782"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000947",
+        "@id": "urn:nrel_example/nrel00001016",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000947"
+                "@value": "nrel00001016"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000665",
+        "@id": "urn:nrel_example/nrel00000283",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000665"
+                "@value": "nrel00000283"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000083",
+        "@id": "urn:nrel_example/nrel00000196",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000437"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001104"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001026"
-            },
+                "@value": "nrel00000196"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000512",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001252"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000083"
+                "@value": "nrel00000512"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000749",
+        "@id": "urn:nrel_example/nrel00000787",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
+            {
+                "@id": "urn:nrel_example/nrel00000080"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000715"
+                "@id": "urn:nrel_example/nrel00000859"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000946"
+                "@id": "urn:nrel_example/nrel00000319"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000749"
+                "@value": "nrel00000787"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000926",
+        "@id": "urn:nrel_example/nrel00001107",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000926"
+                "@value": "nrel00001107"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000178",
+        "@id": "urn:nrel_example/nrel00000663",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -24011,105 +24149,78 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000178"
+                "@value": "nrel00000663"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000055",
+        "@id": "urn:nrel_example/nrel00000973",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000079"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000222"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000016"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000037"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000156"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000195"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000234"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000479"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000922"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001073"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001128"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001173"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001214"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000055"
+                "@value": "nrel00000973"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000963",
+        "@id": "urn:nrel_example/nrel00000229",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000963"
+                "@value": "nrel00000229"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001170",
+        "@id": "urn:nrel_example/nrel00000429",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Filter"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000158"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000940"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000250"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001170"
+                "@value": "nrel00000429"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000802",
+        "@id": "urn:nrel_example/nrel00000905",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000444"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000597"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -24118,51 +24229,56 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000802"
+                "@value": "nrel00000905"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000467",
+        "@id": "urn:nrel_example/nrel00000963",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000467"
+                "@value": "nrel00000963"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000128",
+        "@id": "urn:nrel_example/nrel00001022",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000128"
+                "@value": "nrel00001022"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000076",
+        "@id": "urn:nrel_example/nrel00000991",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -24171,17 +24287,17 @@
         ],
         "http://data.ashrae.org/standard223#mapsTo": [
             {
-                "@id": "urn:nrel_example/nrel00001047"
+                "@id": "urn:nrel_example/nrel00001194"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000076"
+                "@value": "nrel00000991"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000157",
+        "@id": "urn:nrel_example/nrel00001130",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -24197,12 +24313,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000157"
+                "@value": "nrel00001130"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000847",
+        "@id": "urn:nrel_example/nrel00000978",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -24218,191 +24334,166 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000847"
+                "@value": "nrel00000978"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000117",
+        "@id": "urn:nrel_example/nrel00001298",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000966"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000282"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000845"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000117"
+                "@value": "nrel00001298"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001083",
+        "@id": "urn:nrel_example/nrel00000764",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001083"
+                "@value": "nrel00000764"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001073",
+        "@id": "urn:nrel_example/nrel00000561",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000448"
+            },
             {
-                "@value": "nrel00001073"
+                "@id": "urn:nrel_example/nrel00000921"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000406",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00001211"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000106"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001054"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000406"
+                "@value": "nrel00000561"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000650",
+        "@id": "urn:nrel_example/nrel00000109",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000650"
+                "@value": "nrel00000109"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001315",
+        "@id": "urn:nrel_example/nrel00000872",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000441"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:nrel_example/nrel00001234"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000132"
+                "@id": "urn:nrel_example/nrel00001298"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@value": "nrel00001315"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000257",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+                "@id": "urn:nrel_example/nrel00001209"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00001251"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000257"
+                "@value": "nrel00000872"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001250",
+        "@id": "urn:nrel_example/nrel00000157",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001250"
+                "@value": "nrel00000157"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001253",
+        "@id": "urn:nrel_example/nrel00000012",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001253"
+                "@value": "nrel00000012"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000306",
+        "@id": "urn:nrel_example/nrel00000278",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -24413,49 +24504,49 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000306"
+                "@value": "nrel00000278"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000103",
+        "@id": "urn:nrel_example/nrel00000737",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000103"
+                "@value": "nrel00000737"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000401",
+        "@id": "urn:nrel_example/nrel00000686",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00000967"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000176"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000401"
+                "@value": "nrel00000686"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000028",
+        "@id": "urn:nrel_example/nrel00000275",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -24471,39 +24562,48 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000028"
+                "@value": "nrel00000275"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001070",
+        "@id": "urn:nrel_example/nrel00000613",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "urn:nrel_example/nrel00000093"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000894"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
+                "@id": "urn:nrel_example/nrel00000952"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001088"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001070"
+                "@value": "nrel00000613"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000931",
+        "@id": "urn:nrel_example/nrel00000701",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000678"
+                "@id": "urn:nrel_example/nrel00001025"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001203"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -24513,70 +24613,86 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000931"
+                "@value": "nrel00000701"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001284",
+        "@id": "urn:nrel_example/nrel00000915",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000961"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001284"
+                "@value": "nrel00000915"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000389",
+        "@id": "urn:nrel_example/nrel00001228",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+            }
+        ],
+        "http://data.ashrae.org/standard223#mapsTo": [
+            {
+                "@id": "urn:nrel_example/nrel00000227"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000389"
+                "@value": "nrel00001228"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000342",
+        "@id": "urn:nrel_example/nrel00000080",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000967"
+                "@id": "urn:nrel_example/nrel00000220"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001105"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@id": "urn:nrel_example/nrel00001221"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000005"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000319"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000342"
+                "@value": "nrel00000080"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000094",
+        "@id": "urn:nrel_example/nrel00000534",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -24592,73 +24708,75 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000094"
+                "@value": "nrel00000534"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001225",
+        "@id": "urn:nrel_example/nrel00000067",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001225"
+                "@value": "nrel00000067"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001171",
+        "@id": "urn:nrel_example/nrel00000685",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001171"
+                "@value": "nrel00000685"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000657",
+        "@id": "urn:nrel_example/nrel00000439",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000779"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000912"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000767"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001133"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000657"
+                "@value": "nrel00000439"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000775",
+        "@id": "urn:nrel_example/nrel00001101",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000806"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000864"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -24667,30 +24785,35 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000775"
+                "@value": "nrel00001101"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001009",
+        "@id": "urn:nrel_example/nrel00000412",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001009"
+                "@value": "nrel00000412"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000104",
+        "@id": "urn:nrel_example/nrel00000882",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -24699,33 +24822,28 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000104"
+                "@value": "nrel00000882"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000232",
+        "@id": "urn:nrel_example/nrel00000949",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/HZ"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000232"
+                "@value": "nrel00000949"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000176",
+        "@id": "urn:nrel_example/nrel00000081",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -24741,664 +24859,695 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000176"
+                "@value": "nrel00000081"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000444",
+        "@id": "urn:nrel_example/nrel00000653",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000444"
+                "@value": "nrel00000653"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000691",
+        "@id": "urn:nrel_example/nrel00000398",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000535"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000691"
+                "@value": "nrel00000398"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001121",
+        "@id": "urn:nrel_example/nrel00000969",
         "@type": [
             "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
         "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:nrel_example/nrel00001197"
+                "@id": "urn:nrel_example/nrel00000736"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000009"
+                "@id": "urn:nrel_example/nrel00000054"
             },
             {
-                "@id": "urn:nrel_example/nrel00000068"
+                "@id": "urn:nrel_example/nrel00000610"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001121"
+                "@value": "nrel00000969"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000972",
+        "@id": "urn:nrel_example/nrel00000558",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000972"
+                "@value": "nrel00000558"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000209",
+        "@id": "urn:nrel_example/nrel00001017",
         "@type": [
-            "http://data.ashrae.org/standard223#FanCoilUnit"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000099"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000135"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000904"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000131"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000355"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000392"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000752"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000805"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001160"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001233"
+                "@value": "nrel00001017"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001141",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Heating"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000209"
+                "@value": "nrel00001141"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000245",
+        "@id": "urn:nrel_example/nrel00000620",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000245"
+                "@value": "nrel00000620"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000471",
+        "@id": "urn:nrel_example/nrel00000831",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000471"
+                "@value": "nrel00000831"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000714",
+        "@id": "urn:nrel_example/nrel00000217",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000161"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000565"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000714"
+                "@value": "nrel00000217"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000609",
+        "@id": "urn:nrel_example/nrel00000337",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "urn:nrel_example/nrel00000469"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000509"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "urn:nrel_example/nrel00000119"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000671"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000609"
+                "@value": "nrel00000337"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000027",
+        "@id": "urn:nrel_example/nrel00000404",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000027"
+                "@value": "nrel00000404"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000627",
+        "@id": "urn:nrel_example/nrel00000099",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Fan"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000297"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000541"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000036"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000181"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000210"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000259"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000304"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000375"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000609"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000690"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000744"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000954"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001147"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000627"
+                "@value": "nrel00000099"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000826",
+        "@id": "urn:nrel_example/nrel00000387",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000826"
+                "@value": "nrel00000387"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000183",
+        "@id": "urn:nrel_example/nrel00000904",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#CoolingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000112"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000123"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000183"
+                "@id": "urn:nrel_example/nrel00000248"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000874"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000973"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000996"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000693",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000140"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000298"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000330"
+            },
             {
-                "@id": "urn:nrel_example/nrel00001194"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:nrel_example/nrel00001239"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000373"
+                "@id": "urn:nrel_example/nrel00001317"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000693"
+                "@value": "nrel00000904"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000156",
+        "@id": "urn:nrel_example/nrel00000002",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000156"
+                "@value": "nrel00000002"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000253",
+        "@id": "urn:nrel_example/nrel00000672",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000253"
+                "@value": "nrel00000672"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000425",
+        "@id": "urn:nrel_example/nrel00001229",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000425"
+                "@value": "nrel00001229"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000030",
+        "@id": "urn:nrel_example/nrel00000608",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00001265"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000809"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000030"
+                "@value": "nrel00000608"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000797",
+        "@id": "urn:nrel_example/nrel00000107",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000875"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001023"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000797"
+                "@value": "nrel00000107"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000122",
+        "@id": "urn:nrel_example/nrel00000692",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000074"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000781"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000335"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001167"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000122"
+                "@value": "nrel00000692"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000102",
+        "@id": "urn:nrel_example/nrel00000290",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000102"
+                "@value": "nrel00000290"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000009",
+        "@id": "urn:nrel_example/nrel00000418",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:nrel_example/nrel00000485"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:nrel_example/nrel00000457"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000009"
+                "@value": "nrel00000418"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000426",
+        "@id": "urn:nrel_example/nrel00000309",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000971"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001144"
+                "@id": "urn:nrel_example/nrel00000000"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001220"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000426"
+                "@value": "nrel00000309"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000431",
+        "@id": "urn:nrel_example/nrel00000870",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Pump"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:nrel_example/nrel00000901"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000975"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@value": "nrel00000431"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000611",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+                "@id": "urn:nrel_example/nrel00000177"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000590"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+                "@id": "urn:nrel_example/nrel00000279"
+            },
             {
-                "@id": "urn:nrel_example/nrel00001121"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:nrel_example/nrel00000547"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000009"
+                "@id": "urn:nrel_example/nrel00000863"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000972"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001045"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001053"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001175"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001253"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001310"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000611"
+                "@value": "nrel00000870"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000203",
+        "@id": "urn:nrel_example/nrel00000584",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000203"
+                "@value": "nrel00000584"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000049",
+        "@id": "urn:nrel_example/nrel00001208",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000165"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000175"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000049"
+                "@value": "nrel00001208"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000115",
+        "@id": "urn:nrel_example/nrel00000505",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#HeatingCoil"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00000626"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001071"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001266"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000115"
+                "@id": "urn:nrel_example/nrel00000321"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000748"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000983"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001117"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001111",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000936"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001236"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001111"
+                "@value": "nrel00000505"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001235",
+        "@id": "urn:nrel_example/nrel00000219",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001235"
+                "@value": "nrel00000219"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000624",
+        "@id": "urn:nrel_example/nrel00000732",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000624"
+                "@value": "nrel00000732"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001097",
+        "@id": "urn:nrel_example/nrel00000047",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -25409,51 +25558,54 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001097"
+                "@value": "nrel00000047"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000071",
+        "@id": "urn:nrel_example/nrel00000236",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000071"
+                "@value": "nrel00000236"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000387",
+        "@id": "urn:nrel_example/nrel00000355",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000387"
+                "@value": "nrel00000355"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000222",
+        "@id": "urn:nrel_example/nrel00000535",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000691"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000699"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -25462,12 +25614,12 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000222"
+                "@value": "nrel00000535"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000784",
+        "@id": "urn:nrel_example/nrel00000912",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -25478,136 +25630,161 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000784"
+                "@value": "nrel00000912"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001278",
+        "@id": "urn:nrel_example/nrel00000656",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001260"
-            },
+                "@id": "urn:nrel_example/nrel00000736"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001311"
+                "@id": "urn:nrel_example/nrel00000969"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00001295"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001278"
+                "@value": "nrel00000656"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000924",
+        "@id": "urn:nrel_example/nrel00000313",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000296"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000428"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000066"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001269"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000924"
+                "@value": "nrel00000313"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000725",
+        "@id": "urn:nrel_example/nrel00000861",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000441"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000590"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000725"
+                "@value": "nrel00000861"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000579",
+        "@id": "urn:nrel_example/nrel00000069",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000579"
+                "@value": "nrel00000069"
             }
         ]
     },
     {
-        "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus",
+        "@id": "urn:nrel_example/nrel00000675",
         "@type": [
-            "http://data.ashrae.org/standard223#Class",
-            "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus",
-            "http://www.w3.org/ns/shacl#NodeShape"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "EnumerationKind FlowStatus"
+                "@id": "urn:nrel_example/nrel00000574"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000691"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#subClassOf": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind"
+                "@id": "urn:nrel_example/nrel00000347"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001153"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000675"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000538",
+        "@id": "urn:nrel_example/nrel00001013",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000439"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000114"
+                "@value": "nrel00001013"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000030",
+        "@type": [
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000477"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000538"
+                "@value": "nrel00000030"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000718",
+        "@id": "urn:nrel_example/nrel00000263",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -25623,266 +25800,241 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000718"
+                "@value": "nrel00000263"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000903",
+        "@id": "urn:nrel_example/nrel00000674",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000589"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@value": "nrel00000674"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001109",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+        ],
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
+            {
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000903"
+                "@value": "nrel00001109"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001197",
+        "@id": "urn:nrel_example/nrel00000819",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000466"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000590"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@value": "nrel00000819"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000162",
+        "@type": [
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000499"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001306"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001197"
+                "@value": "nrel00000162"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000598",
+        "@id": "urn:nrel_example/nrel00000893",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000598"
+                "@value": "nrel00000893"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000454",
+        "@id": "urn:nrel_example/nrel00000443",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000019"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001018"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000411"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000962"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000454"
+                "@value": "nrel00000443"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001254",
+        "@id": "urn:nrel_example/nrel00000438",
         "@type": [
-            "http://data.ashrae.org/standard223#TerminalUnit"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000342"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000524"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000686"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000782"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001231"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000688"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000967"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000176"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000865"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001221"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001254"
+                "@value": "nrel00000438"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001146",
+        "@id": "urn:nrel_example/nrel00001278",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+                "@id": "urn:nrel_example/nrel00001260"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001311"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001146"
+                "@value": "nrel00001278"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000247",
+        "@id": "urn:nrel_example/nrel00000961",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001105"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000859"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000987"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000247"
+                "@value": "nrel00000961"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001162",
+        "@id": "urn:nrel_example/nrel00001231",
         "@type": [
             "http://data.ashrae.org/standard223#Valve"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000069"
+                "@id": "urn:nrel_example/nrel00000366"
             },
             {
-                "@id": "urn:nrel_example/nrel00000482"
+                "@id": "urn:nrel_example/nrel00000655"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000111"
+                "@id": "urn:nrel_example/nrel00000695"
             },
             {
-                "@id": "urn:nrel_example/nrel00001319"
+                "@id": "urn:nrel_example/nrel00001271"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001162"
+                "@value": "nrel00001231"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000419",
+        "@id": "urn:nrel_example/nrel00001160",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000419"
+                "@value": "nrel00001160"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000944",
+        "@id": "urn:nrel_example/nrel00001198",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000461"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001166"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000944"
+                "@value": "nrel00001198"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001041",
+        "@id": "urn:nrel_example/nrel00000788",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -25893,223 +26045,182 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001041"
+                "@value": "nrel00000788"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000728",
+        "@id": "urn:nrel_example/nrel00000706",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000728"
+                "@value": "nrel00000706"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000988",
+        "@id": "urn:nrel_example/nrel00000647",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000150"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000836"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000052"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000360"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000988"
+                "@value": "nrel00000647"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000754",
+        "@id": "urn:nrel_example/nrel00000112",
         "@type": [
             "http://data.ashrae.org/standard223#Pump"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000376"
+                "@id": "urn:nrel_example/nrel00000407"
             },
             {
-                "@id": "urn:nrel_example/nrel00000712"
+                "@id": "urn:nrel_example/nrel00000621"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000044"
+                "@id": "urn:nrel_example/nrel00000316"
             },
             {
-                "@id": "urn:nrel_example/nrel00000180"
+                "@id": "urn:nrel_example/nrel00000455"
             },
             {
-                "@id": "urn:nrel_example/nrel00000310"
+                "@id": "urn:nrel_example/nrel00000506"
             },
             {
-                "@id": "urn:nrel_example/nrel00000370"
+                "@id": "urn:nrel_example/nrel00000536"
             },
             {
-                "@id": "urn:nrel_example/nrel00000377"
+                "@id": "urn:nrel_example/nrel00000583"
             },
             {
-                "@id": "urn:nrel_example/nrel00000639"
+                "@id": "urn:nrel_example/nrel00000666"
             },
             {
-                "@id": "urn:nrel_example/nrel00000868"
+                "@id": "urn:nrel_example/nrel00000721"
             },
             {
-                "@id": "urn:nrel_example/nrel00000997"
+                "@id": "urn:nrel_example/nrel00000764"
             },
             {
-                "@id": "urn:nrel_example/nrel00001010"
+                "@id": "urn:nrel_example/nrel00000851"
             },
             {
-                "@id": "urn:nrel_example/nrel00001257"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000754"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000491",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://data.ashrae.org/standard223#mapsTo": [
-            {
-                "@id": "urn:nrel_example/nrel00000864"
+                "@id": "urn:nrel_example/nrel00001103"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000491"
+                "@value": "nrel00000112"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000977",
+        "@id": "urn:nrel_example/nrel00001282",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000977"
+                "@value": "nrel00001282"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000442",
+        "@id": "urn:nrel_example/nrel00000456",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000442"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000524",
-        "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000967"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
-            {
-                "@id": "urn:nrel_example/nrel00000865"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000524"
+                "@value": "nrel00000456"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000766",
+        "@id": "urn:nrel_example/nrel00000668",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000766"
+                "@value": "nrel00000668"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000069",
+        "@id": "urn:nrel_example/nrel00000846",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000069"
+                "@value": "nrel00000846"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001147",
+        "@id": "urn:nrel_example/nrel00000102",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -26118,148 +26229,121 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001147"
+                "@value": "nrel00000102"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000525",
+        "@id": "urn:nrel_example/nrel00000700",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000525"
+                "@value": "nrel00000700"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000359",
+        "@id": "urn:nrel_example/nrel00000096",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/A"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000359"
+                "@value": "nrel00000096"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000336",
+        "@id": "urn:nrel_example/nrel00001121",
         "@type": [
             "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
         "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:nrel_example/nrel00000818"
+                "@id": "urn:nrel_example/nrel00001197"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000471"
+                "@id": "urn:nrel_example/nrel00000009"
             },
             {
-                "@id": "urn:nrel_example/nrel00000680"
+                "@id": "urn:nrel_example/nrel00000068"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000336"
+                "@value": "nrel00001121"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000405",
+        "@id": "urn:nrel_example/nrel00000996",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000405"
+                "@value": "nrel00000996"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000265",
+        "@id": "urn:nrel_example/nrel00001239",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@value": "nrel00000265"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000659",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000659"
+                "@value": "nrel00001239"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001015",
+        "@id": "urn:nrel_example/nrel00000597",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000487"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001099"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000024"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000979"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001015"
+                "@value": "nrel00000597"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001161",
+        "@id": "urn:nrel_example/nrel00000516",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -26270,114 +26354,112 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001161"
+                "@value": "nrel00000516"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000580",
+        "@id": "urn:nrel_example/nrel00000990",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000337"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000741"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001190"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000229"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000389"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000463"
-            },
+                "@id": "http://qudt.org/vocab/unit/KiloW"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000756"
+                "@value": "nrel00000990"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001048",
+        "@type": [
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000968"
-            },
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00001307"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000580"
+                "@value": "nrel00001048"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000369",
+        "@id": "urn:nrel_example/nrel00000024",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000441"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000758"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000369"
+                "@value": "nrel00000024"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000745",
+        "@id": "urn:nrel_example/nrel00000475",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000745"
+                "@value": "nrel00000475"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000230",
+        "@id": "urn:nrel_example/nrel00001205",
         "@type": [
             "http://data.ashrae.org/standard223#Sensor"
         ],
         "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001194"
+                "@id": "urn:nrel_example/nrel00000504"
             }
         ],
         "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001022"
+                "@id": "urn:nrel_example/nrel00000263"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000230"
+                "@value": "nrel00001205"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000290",
+        "@id": "urn:nrel_example/nrel00000826",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
@@ -26388,232 +26470,165 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000290"
+                "@value": "nrel00000826"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001115",
+        "@id": "urn:nrel_example/nrel00001144",
         "@type": [
-            "http://data.ashrae.org/standard223#Pump"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000014"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000237"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000102"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000108"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000327"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000338"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000453"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000633"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000732"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001118"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001148"
-            },
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001206"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001115"
+                "@value": "nrel00001144"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000777",
+        "@id": "urn:nrel_example/nrel00000875",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000776"
+                "@id": "urn:nrel_example/nrel00000107"
             },
             {
-                "@id": "urn:nrel_example/nrel00001164"
+                "@id": "urn:nrel_example/nrel00000899"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000159"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000185"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000379"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000450"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000563"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000662"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000761"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000778"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000889"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000974"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00001290"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000777"
+                "@value": "nrel00000875"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001008",
+        "@id": "urn:nrel_example/nrel00000641",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatingCoil"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000092"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000400"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000454"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000017"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000305"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000797"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001144"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000275"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000738"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001008"
+                "@value": "nrel00000641"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000764",
+        "@id": "urn:nrel_example/nrel00001283",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/V"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000764"
+                "@value": "nrel00001283"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000675",
+        "@id": "urn:nrel_example/nrel00000554",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000574"
-            },
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000691"
+                "@value": "nrel00000554"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000077",
+        "@type": [
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000347"
+                "@id": "urn:nrel_example/nrel00000424"
             },
             {
-                "@id": "urn:nrel_example/nrel00001153"
+                "@id": "urn:nrel_example/nrel00000892"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000675"
+                "@value": "nrel00000077"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000956",
+        "@id": "urn:nrel_example/nrel00000931",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:nrel_example/nrel00000678"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000956"
+                "@value": "nrel00000931"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001107",
+        "@id": "urn:nrel_example/nrel00000678",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000931"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001256"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -26622,160 +26637,160 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001107"
+                "@value": "nrel00000678"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000068",
+        "@id": "urn:nrel_example/nrel00000351",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:nrel_example/nrel00000172"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000068"
+                "@value": "nrel00000351"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000066",
+        "@id": "urn:nrel_example/nrel00000098",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000066"
+                "@value": "nrel00000098"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001252",
+        "@id": "urn:nrel_example/nrel00000667",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00000207"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000443"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001252"
+                "@value": "nrel00000667"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001103",
+        "@id": "urn:nrel_example/nrel00000389",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001103"
+                "@value": "nrel00000389"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000001",
+        "@id": "urn:nrel_example/nrel00001202",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000001"
+                "@value": "nrel00001202"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000684",
+        "@id": "urn:nrel_example/nrel00000013",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000684"
+                "@value": "nrel00000013"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001311",
+        "@id": "urn:nrel_example/nrel00000569",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001311"
+                "@value": "nrel00000569"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000116",
+        "@id": "urn:nrel_example/nrel00000391",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000116"
+                "@value": "nrel00000391"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001287",
+        "@id": "urn:nrel_example/nrel00000758",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -26791,119 +26806,86 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001287"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000798",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
-            {
-                "@value": "nrel00000798"
+                "@value": "nrel00000758"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000872",
+        "@id": "urn:nrel_example/nrel00000849",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00001234"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001298"
+                "@id": "urn:nrel_example/nrel00000948"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00001209"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001251"
+                "@id": "urn:nrel_example/nrel00000048"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000872"
+                "@value": "nrel00000849"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001308",
+        "@id": "urn:nrel_example/nrel00000754",
         "@type": [
-            "http://data.ashrae.org/standard223#Fan"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000291"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000496"
-            }
+            "http://data.ashrae.org/standard223#Pump"
         ],
         "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000970"
+                "@id": "urn:nrel_example/nrel00000376"
             },
             {
-                "@id": "urn:nrel_example/nrel00001207"
+                "@id": "urn:nrel_example/nrel00000712"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000283"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000651"
+                "@id": "urn:nrel_example/nrel00000044"
             },
             {
-                "@id": "urn:nrel_example/nrel00000661"
+                "@id": "urn:nrel_example/nrel00000180"
             },
             {
-                "@id": "urn:nrel_example/nrel00000674"
+                "@id": "urn:nrel_example/nrel00000310"
             },
             {
-                "@id": "urn:nrel_example/nrel00000811"
+                "@id": "urn:nrel_example/nrel00000370"
             },
             {
-                "@id": "urn:nrel_example/nrel00000963"
+                "@id": "urn:nrel_example/nrel00000377"
             },
             {
-                "@id": "urn:nrel_example/nrel00001016"
+                "@id": "urn:nrel_example/nrel00000639"
             },
             {
-                "@id": "urn:nrel_example/nrel00001132"
+                "@id": "urn:nrel_example/nrel00000868"
             },
             {
-                "@id": "urn:nrel_example/nrel00001272"
+                "@id": "urn:nrel_example/nrel00000997"
             },
             {
-                "@id": "urn:nrel_example/nrel00001273"
+                "@id": "urn:nrel_example/nrel00001010"
             },
             {
-                "@id": "urn:nrel_example/nrel00001331"
+                "@id": "urn:nrel_example/nrel00001257"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001308"
+                "@value": "nrel00000754"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000174",
+        "@id": "urn:nrel_example/nrel00000791",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
@@ -26917,70 +26899,102 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000174"
+                "@value": "nrel00000791"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000698",
+        "@id": "urn:nrel_example/nrel00000247",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
+                "@id": "urn:nrel_example/nrel00001105"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "urn:nrel_example/nrel00000859"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000987"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000698"
+                "@value": "nrel00000247"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000919",
+        "@id": "urn:nrel_example/nrel00001074",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000026"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000094"
+                "@value": "nrel00001074"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000902",
+        "@type": [
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000100"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000775"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000919"
+                "@value": "nrel00000902"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001237",
+        "@id": "urn:nrel_example/nrel00000426",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00000971"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001144"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001237"
+                "@value": "nrel00000426"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000438",
+        "@id": "urn:nrel_example/nrel00000059",
         "@type": [
             "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
@@ -26991,33 +27005,89 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000438"
+                "@value": "nrel00000059"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000687",
+        "@id": "urn:nrel_example/nrel00000035",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#CoolingCoil"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000522"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000824"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000317"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000685"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000808"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000976"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000028"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000085"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000243"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000253"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000994"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000687"
+                "@value": "nrel00000035"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001017",
+        "@id": "urn:nrel_example/nrel00000254",
+        "@type": [
+            "http://data.ashrae.org/standard223#Damper"
+        ],
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+            {
+                "@id": "urn:nrel_example/nrel00000424"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001274"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000288"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000617"
+            }
+        ],
+        "http://www.w3.org/2000/01/rdf-schema#label": [
+            {
+                "@value": "nrel00000254"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000877",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
         ],
@@ -27028,42 +27098,44 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001017"
+                "@value": "nrel00000877"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001313",
+        "@id": "urn:nrel_example/nrel00000538",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000439"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000114"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000477"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001313"
+                "@value": "nrel00000538"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000902",
+        "@id": "urn:nrel_example/nrel00000577",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000100"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000775"
+                "@id": "urn:nrel_example/nrel00000891"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -27071,78 +27143,84 @@
                 "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000687"
+            }
+        ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000902"
+                "@value": "nrel00000577"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000566",
+        "@id": "urn:nrel_example/nrel00000027",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000566"
+                "@value": "nrel00000027"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001240",
+        "@id": "urn:nrel_example/nrel00001267",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000186"
+            },
             {
-                "@value": "nrel00001240"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000647",
-        "@type": [
-            "http://data.ashrae.org/standard223#Valve"
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+                "@id": "urn:nrel_example/nrel00000236"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000150"
+                "@id": "urn:nrel_example/nrel00000245"
             },
             {
-                "@id": "urn:nrel_example/nrel00000836"
+                "@id": "urn:nrel_example/nrel00000339"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000444"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000627"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasDomain": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000052"
+                "@id": "urn:nrel_example/nrel00000184"
             },
             {
-                "@id": "urn:nrel_example/nrel00000360"
+                "@id": "urn:nrel_example/nrel00000743"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000647"
+                "@value": "nrel00001267"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000368",
+        "@id": "urn:nrel_example/nrel00000765",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -27158,270 +27236,228 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000368"
+                "@value": "nrel00000765"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000125",
+        "@id": "urn:nrel_example/nrel00001325",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000724"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000802"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000125"
+                "@value": "nrel00001325"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000719",
+        "@id": "urn:nrel_example/nrel00000972",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000719"
+                "@value": "nrel00000972"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000803",
+        "@id": "urn:nrel_example/nrel00000664",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000803"
+                "@value": "nrel00000664"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001153",
+        "@id": "urn:nrel_example/nrel00000078",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001153"
+                "@value": "nrel00000078"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001003",
+        "@id": "urn:nrel_example/nrel00000958",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#TerminalUnit"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "urn:nrel_example/nrel00000050"
-            }
-        ],
-        "http://data.ashrae.org/standard223#observes": [
+                "@id": "urn:nrel_example/nrel00000152"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000853"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000521"
+            },
             {
-                "@value": "nrel00001003"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000911",
-        "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+                "@id": "urn:nrel_example/nrel00000591"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000869"
+                "@id": "urn:nrel_example/nrel00000628"
             },
             {
-                "@id": "urn:nrel_example/nrel00001183"
+                "@id": "urn:nrel_example/nrel00001155"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000208"
+            },
             {
-                "@value": "nrel00000911"
+                "@id": "urn:nrel_example/nrel00000354"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001031",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+                "@id": "urn:nrel_example/nrel00000139"
+            },
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
+                "@id": "urn:nrel_example/nrel00000823"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000985"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001031"
+                "@value": "nrel00000958"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000250",
+        "@id": "urn:nrel_example/nrel00000359",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000250"
+                "@value": "nrel00000359"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000990",
+        "@id": "urn:nrel_example/nrel00000726",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000990"
+                "@value": "nrel00000726"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000388",
+        "@id": "urn:nrel_example/nrel00000214",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
-            {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
-            }
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000388"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000504",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000408"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000526"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@value": "nrel00000504"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000877",
-        "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
-        ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+                "@id": "urn:nrel_example/nrel00000395"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "urn:nrel_example/nrel00001170"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000877"
+                "@value": "nrel00000214"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001148",
+        "@id": "urn:nrel_example/nrel00000320",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001148"
+                "@value": "nrel00000320"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000045",
+        "@id": "urn:nrel_example/nrel00001193",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -27430,201 +27466,186 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000045"
+                "@value": "nrel00001193"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000213",
+        "@id": "urn:nrel_example/nrel00000205",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000025"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000076"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000194"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000299"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000213"
+                "@value": "nrel00000205"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000430",
+        "@id": "urn:nrel_example/nrel00000665",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/RelativeHumidity"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT_RH"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000430"
+                "@value": "nrel00000665"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001036",
+        "@id": "urn:nrel_example/nrel00000829",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000600"
             }
         ],
-        "http://data.ashrae.org/standard223#mapsTo": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000462"
+                "@id": "urn:nrel_example/nrel00000114"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00000847"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001036"
+                "@value": "nrel00000829"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000683",
+        "@id": "urn:nrel_example/nrel00001168",
         "@type": [
-            "http://data.ashrae.org/standard223#HeatExchanger"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000083"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000344"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000546"
+                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000183"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000189"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000271"
-            },
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000923"
+                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000067"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000163"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00001094"
+                "@value": "nrel00001168"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000926",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasRole": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Role-Evaporator"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-FlowStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000683"
+                "@value": "nrel00000926"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000851",
+        "@id": "urn:nrel_example/nrel00000820",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000851"
+                "@value": "nrel00000820"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000608",
+        "@id": "urn:nrel_example/nrel00000548",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001265"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00000809"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000608"
+                "@value": "nrel00000548"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000031",
+        "@id": "urn:nrel_example/nrel00001186",
         "@type": [
-            "http://data.ashrae.org/standard223#Valve"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00000840"
+                "@id": "urn:nrel_example/nrel00000074"
             },
             {
-                "@id": "urn:nrel_example/nrel00000858"
+                "@id": "urn:nrel_example/nrel00001208"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000268"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000598"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000031"
+                "@value": "nrel00001186"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001101",
+        "@id": "urn:nrel_example/nrel00001123",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000806"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000864"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -27633,167 +27654,148 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001101"
+                "@value": "nrel00001123"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000542",
+        "@id": "urn:nrel_example/nrel00000691",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000535"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000542"
+                "@value": "nrel00000691"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000740",
+        "@id": "urn:nrel_example/nrel00000731",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000640"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001270"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000740"
+                "@value": "nrel00000731"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000204",
+        "@id": "urn:nrel_example/nrel00000697",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPotential"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/V"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000204"
+                "@value": "nrel00000697"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000933",
+        "@id": "urn:nrel_example/nrel00000832",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Frequency"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/HZ"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000933"
+                "@value": "nrel00000832"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000703",
+        "@id": "urn:nrel_example/nrel00000383",
         "@type": [
-            "http://data.ashrae.org/standard223#Damper"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000215"
-            },
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00001108"
+                "@id": "urn:nrel_example/nrel00000430"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000698"
-            },
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00001188"
+                "@id": "urn:nrel_example/nrel00000795"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000703"
+                "@value": "nrel00000383"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000129",
+        "@id": "urn:nrel_example/nrel00000816",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Energy"
-            }
-        ],
-        "http://qudt.org/schema/qudt/hasUnit": [
-            {
-                "@id": "http://qudt.org/vocab/unit/KiloW-HR"
-            }
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@value": "nrel00000129"
+                "@id": "urn:nrel_example/nrel00001125"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000758",
-        "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000500"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000002"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000758"
+                "@value": "nrel00000816"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000264",
+        "@id": "urn:nrel_example/nrel00000638",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
@@ -27802,306 +27804,327 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000264"
+                "@value": "nrel00000638"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000060",
+        "@id": "urn:nrel_example/nrel00000546",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
+            "http://data.ashrae.org/standard223#Equipment"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+                "@value": "nrel00000546"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000382",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000060"
+                "@value": "nrel00000382"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000151",
+        "@id": "urn:nrel_example/nrel00001032",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000151"
+                "@value": "nrel00001032"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000866",
+        "@id": "urn:nrel_example/nrel00000938",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#TerminalUnit"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:nrel_example/nrel00000073"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000324"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000510"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001223"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001232"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:nrel_example/nrel00000742"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000961"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasProperty": [
+            {
+                "@id": "urn:nrel_example/nrel00000064"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000332"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000475"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000866"
+                "@value": "nrel00000938"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000412",
+        "@id": "urn:nrel_example/nrel00000064",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/IN_H2O"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000412"
+                "@value": "nrel00000064"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000279",
+        "@id": "urn:nrel_example/nrel00000038",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#FanCoilUnit"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#contains": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000495"
+            },
             {
-                "@value": "nrel00000279"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000596",
-        "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
-        ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+                "@id": "urn:nrel_example/nrel00000780"
+            },
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00001187"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@value": "nrel00000596"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00001027",
-        "@type": [
-            "http://data.ashrae.org/standard223#PhysicalSpace"
-        ],
-        "http://data.ashrae.org/standard223#encloses": [
+                "@id": "urn:nrel_example/nrel00000420"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000122"
+                "@id": "urn:nrel_example/nrel00001270"
             }
         ],
         "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000206"
+                "@id": "urn:nrel_example/nrel00000173"
             },
             {
-                "@id": "urn:nrel_example/nrel00000537"
-            }
-        ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+                "@id": "urn:nrel_example/nrel00000212"
+            },
             {
-                "@value": "nrel00001027"
-            }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000642",
-        "@type": [
-            "http://data.ashrae.org/standard223#Duct"
-        ],
-        "http://data.ashrae.org/standard223#cnx": [
+                "@id": "urn:nrel_example/nrel00000228"
+            },
             {
-                "@id": "urn:nrel_example/nrel00000586"
+                "@id": "urn:nrel_example/nrel00000329"
             },
             {
-                "@id": "urn:nrel_example/nrel00000923"
+                "@id": "urn:nrel_example/nrel00000884"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasRole": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Role-Cooling"
+            },
+            {
+                "@id": "http://data.ashrae.org/standard223#Role-Heating"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000642"
+                "@value": "nrel00000038"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001072",
+        "@id": "urn:nrel_example/nrel00001206",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001072"
+                "@value": "nrel00001206"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001143",
+        "@id": "urn:nrel_example/nrel00000421",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "urn:nrel_example/nrel00000512"
+                "@id": "urn:nrel_example/nrel00000814"
             },
             {
-                "@id": "urn:nrel_example/nrel00001193"
+                "@id": "urn:nrel_example/nrel00001196"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000879"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001097"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001143"
+                "@value": "nrel00000421"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000634",
+        "@id": "urn:nrel_example/nrel00001279",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000634"
+                "@value": "nrel00001279"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001090",
+        "@id": "urn:nrel_example/nrel00000934",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Valve"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "urn:nrel_example/nrel00000153"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000302"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "urn:nrel_example/nrel00000653"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001249"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001090"
+                "@value": "nrel00000934"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000272",
+        "@id": "urn:nrel_example/nrel00000837",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000272"
+                "@value": "nrel00000837"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000113",
+        "@id": "urn:nrel_example/nrel00000851",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000113"
+                "@value": "nrel00000851"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000976",
+        "@id": "urn:nrel_example/nrel00001088",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000976"
+                "@value": "nrel00001088"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000674",
+        "@id": "urn:nrel_example/nrel00000767",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -28112,123 +28135,125 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000674"
+                "@value": "nrel00000767"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000600",
+        "@id": "urn:nrel_example/nrel00001249",
         "@type": [
-            "http://data.ashrae.org/standard223#DomainSpace"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000439"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001049"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
-        "http://data.ashrae.org/standard223#hasDomain": [
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
+                "@value": "nrel00001249"
             }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00000143",
+        "@type": [
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000847"
-            },
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "urn:nrel_example/nrel00001059"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000600"
+                "@value": "nrel00000143"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000759",
+        "@id": "urn:nrel_example/nrel00000377",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#QuantifiableActuatableProperty"
         ],
-        "http://data.ashrae.org/standard223#cnx": [
-            {
-                "@id": "urn:nrel_example/nrel00000025"
-            },
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000040"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
             }
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000759"
+                "@value": "nrel00000377"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000548",
+        "@id": "urn:nrel_example/nrel00001235",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000548"
+                "@value": "nrel00001235"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000357",
+        "@id": "urn:nrel_example/nrel00000281",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000357"
+                "@value": "nrel00000281"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001012",
+        "@id": "urn:nrel_example/nrel00000126",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00001299"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000166"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001012"
+                "@value": "nrel00000126"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000689",
+        "@id": "urn:nrel_example/nrel00000357",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
         "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
@@ -28237,215 +28262,213 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000689"
+                "@value": "nrel00000357"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001172",
+        "@id": "urn:nrel_example/nrel00001021",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#Duct"
+        ],
+        "http://data.ashrae.org/standard223#cnx": [
+            {
+                "@id": "urn:nrel_example/nrel00000186"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001301"
+            }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001172"
+                "@value": "nrel00001021"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000035",
+        "@id": "urn:nrel_example/nrel00000241",
         "@type": [
-            "http://data.ashrae.org/standard223#CoolingCoil"
+            "http://data.ashrae.org/standard223#PhysicalSpace"
         ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000522"
-            },
+        "http://data.ashrae.org/standard223#encloses": [
             {
-                "@id": "urn:nrel_example/nrel00000824"
+                "@id": "urn:nrel_example/nrel00000631"
             }
         ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000317"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000685"
-            },
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "urn:nrel_example/nrel00000808"
+                "@id": "urn:nrel_example/nrel00000274"
             },
             {
-                "@id": "urn:nrel_example/nrel00000976"
+                "@id": "urn:nrel_example/nrel00001283"
             }
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000028"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000085"
-            },
+        "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@id": "urn:nrel_example/nrel00000243"
-            },
+                "@value": "nrel00000241"
+            }
+        ]
+    },
+    {
+        "@id": "urn:nrel_example/nrel00001329",
+        "@type": [
+            "http://data.ashrae.org/standard223#Sensor"
+        ],
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "urn:nrel_example/nrel00000253"
-            },
+                "@id": "urn:nrel_example/nrel00000207"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
             {
-                "@id": "urn:nrel_example/nrel00000994"
+                "@id": "urn:nrel_example/nrel00000709"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000035"
+                "@value": "nrel00001329"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000653",
+        "@id": "urn:nrel_example/nrel00001122",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000653"
+                "@value": "nrel00001122"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000086",
+        "@id": "urn:nrel_example/nrel00000001",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://qudt.org/vocab/unit/KiloW"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000086"
+                "@value": "nrel00000001"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000592",
+        "@id": "urn:nrel_example/nrel00000370",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000592"
+                "@value": "nrel00000370"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000493",
+        "@id": "urn:nrel_example/nrel00001075",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00000587"
-            }
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "urn:nrel_example/nrel00000160"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricCurrent"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "urn:nrel_example/nrel00000844"
+                "@id": "http://qudt.org/vocab/unit/A"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000493"
+                "@value": "nrel00001075"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001249",
+        "@id": "urn:nrel_example/nrel00000528",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001249"
+                "@value": "nrel00000528"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001259",
+        "@id": "urn:nrel_example/nrel00001299",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001259"
+                "@value": "nrel00001299"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000042",
+        "@id": "urn:nrel_example/nrel00000885",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Pressure"
+                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/IN_H2O"
+                "@id": "http://qudt.org/vocab/unit/DEG_C"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000042"
+                "@value": "nrel00000885"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000962",
+        "@id": "urn:nrel_example/nrel00000347",
         "@type": [
             "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
@@ -28456,230 +28479,209 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000962"
+                "@value": "nrel00000347"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000108",
+        "@id": "urn:nrel_example/nrel00000622",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000108"
+                "@value": "nrel00000622"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000379",
+        "@id": "urn:nrel_example/nrel00000615",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
+                "@id": "urn:nrel_example/nrel00000281"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000354"
+            }
+        ],
+        "http://data.ashrae.org/standard223#hasMedium": [
+            {
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000379"
+                "@value": "nrel00000615"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001168",
+        "@id": "urn:nrel_example/nrel00000483",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
+            "http://data.ashrae.org/standard223#Sensor"
         ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
+        "http://data.ashrae.org/standard223#hasObservationLocation": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/VolumeFlowRate"
+                "@id": "urn:nrel_example/nrel00000862"
             }
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasPhysicalLocation": [
             {
-                "@id": "http://qudt.org/vocab/unit/FT3-PER-MIN"
+                "@id": "urn:nrel_example/nrel00000464"
+            }
+        ],
+        "http://data.ashrae.org/standard223#observes": [
+            {
+                "@id": "urn:nrel_example/nrel00001134"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001168"
+                "@value": "nrel00000483"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001129",
+        "@id": "urn:nrel_example/nrel00000481",
         "@type": [
-            "http://data.ashrae.org/standard223#InletConnectionPoint"
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-Override"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001129"
+                "@value": "nrel00000481"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000746",
+        "@id": "urn:nrel_example/nrel00000120",
         "@type": [
-            "http://data.ashrae.org/standard223#EAU",
-            "http://data.ashrae.org/standard223#Equipment"
-        ],
-        "http://data.ashrae.org/standard223#contains": [
-            {
-                "@id": "urn:nrel_example/nrel00000343"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000429"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000675"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000771"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001003"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001089"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001100"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00001119"
-            }
-        ],
-        "http://data.ashrae.org/standard223#hasConnectionPoint": [
-            {
-                "@id": "urn:nrel_example/nrel00000050"
-            },
-            {
-                "@id": "urn:nrel_example/nrel00000134"
-            }
+            "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasProperty": [
-            {
-                "@id": "urn:nrel_example/nrel00000669"
-            },
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000853"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000746"
+                "@value": "nrel00000120"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000881",
+        "@id": "urn:nrel_example/nrel00000907",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
+            "http://data.ashrae.org/standard223#Duct"
         ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
+        "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00001194"
+                "@id": "urn:nrel_example/nrel00000043"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000790"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001182"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001242"
             }
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000544"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000881"
+                "@value": "nrel00000907"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00001011",
+        "@id": "urn:nrel_example/nrel00000750",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
         "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
+                "@id": "http://qudt.org/vocab/quantitykind/ElectricPower"
             }
         ],
         "http://qudt.org/schema/qudt/hasUnit": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://qudt.org/vocab/unit/KiloW"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00001011"
+                "@value": "nrel00000750"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000748",
+        "@id": "urn:nrel_example/nrel00000862",
         "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
+            "http://data.ashrae.org/standard223#DomainSpace"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasConnectionPoint": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "urn:nrel_example/nrel00000219"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00000792"
             }
         ],
-        "http://www.w3.org/2000/01/rdf-schema#label": [
+        "http://data.ashrae.org/standard223#hasDomain": [
             {
-                "@value": "nrel00000748"
+                "@id": "http://data.ashrae.org/standard223#Domain-HVAC"
             }
-        ]
-    },
-    {
-        "@id": "urn:nrel_example/nrel00000971",
-        "@type": [
-            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#hasMedium": [
+        "http://data.ashrae.org/standard223#hasProperty": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Air"
+                "@id": "urn:nrel_example/nrel00000417"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001134"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000971"
+                "@value": "nrel00000862"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000617",
+        "@id": "urn:nrel_example/nrel00000762",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/DimensionlessRatio"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/PERCENT"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000617"
+                "@value": "nrel00000762"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000727",
+        "@id": "urn:nrel_example/nrel00001238",
         "@type": [
             "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
@@ -28695,95 +28697,93 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000727"
+                "@value": "nrel00001238"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000779",
+        "@id": "urn:nrel_example/nrel00000986",
         "@type": [
             "http://data.ashrae.org/standard223#InletConnectionPoint"
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "http://data.ashrae.org/standard223#Medium-Water"
+                "@id": "http://data.ashrae.org/standard223#Medium-Air"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000779"
+                "@value": "nrel00000986"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000951",
+        "@id": "urn:nrel_example/nrel00001214",
         "@type": [
-            "http://data.ashrae.org/standard223#EnumeratedActuatableProperty"
+            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
         ],
-        "http://data.ashrae.org/standard223#hasEnumerationKind": [
+        "http://qudt.org/schema/qudt/hasQuantityKind": [
             {
-                "@id": "http://data.ashrae.org/standard223#EnumerationKind-RunStatus"
+                "@id": "http://qudt.org/vocab/quantitykind/PositiveDimensionlessRatio"
+            }
+        ],
+        "http://qudt.org/schema/qudt/hasUnit": [
+            {
+                "@id": "http://qudt.org/vocab/unit/PERCENT"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000951"
+                "@value": "nrel00001214"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000293",
+        "@id": "urn:nrel_example/nrel00000858",
         "@type": [
-            "http://data.ashrae.org/standard223#Sensor"
-        ],
-        "http://data.ashrae.org/standard223#hasObservationLocation": [
-            {
-                "@id": "urn:nrel_example/nrel00001069"
-            }
+            "http://data.ashrae.org/standard223#OutletConnectionPoint"
         ],
-        "http://data.ashrae.org/standard223#observes": [
+        "http://data.ashrae.org/standard223#hasMedium": [
             {
-                "@id": "urn:nrel_example/nrel00000419"
+                "@id": "http://data.ashrae.org/standard223#Medium-Water"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000293"
+                "@value": "nrel00000858"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000673",
+        "@id": "urn:nrel_example/nrel00000145",
         "@type": [
-            "http://data.ashrae.org/standard223#QuantifiableObservableProperty"
-        ],
-        "http://qudt.org/schema/qudt/hasQuantityKind": [
-            {
-                "@id": "http://qudt.org/vocab/quantitykind/Temperature"
-            }
+            "http://data.ashrae.org/standard223#EnumeratedObservableProperty"
         ],
-        "http://qudt.org/schema/qudt/hasUnit": [
+        "http://data.ashrae.org/standard223#hasEnumerationKind": [
             {
-                "@id": "http://qudt.org/vocab/unit/DEG_C"
+                "@id": "http://data.ashrae.org/standard223#EnumerationKind-AlarmStatus"
             }
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000673"
+                "@value": "nrel00000145"
             }
         ]
     },
     {
-        "@id": "urn:nrel_example/nrel00000701",
+        "@id": "urn:nrel_example/nrel00000058",
         "@type": [
-            "http://data.ashrae.org/standard223#Duct"
+            "http://data.ashrae.org/standard223#Junction"
         ],
         "http://data.ashrae.org/standard223#cnx": [
             {
-                "@id": "urn:nrel_example/nrel00001025"
+                "@id": "urn:nrel_example/nrel00000760"
             },
             {
-                "@id": "urn:nrel_example/nrel00001203"
+                "@id": "urn:nrel_example/nrel00000984"
+            },
+            {
+                "@id": "urn:nrel_example/nrel00001260"
             }
         ],
         "http://data.ashrae.org/standard223#hasMedium": [
@@ -28793,7 +28793,7 @@
         ],
         "http://www.w3.org/2000/01/rdf-schema#label": [
             {
-                "@value": "nrel00000701"
+                "@value": "nrel00000058"
             }
         ]
     }
diff --git a/searchindex.js b/searchindex.js
index 93926059..cf7833ed 100644
--- a/searchindex.js
+++ b/searchindex.js
@@ -1 +1 @@
-Search.setIndex({"docnames": ["examples/NREL-example", "examples/guideline36-2021-4.1", "examples/guideline36-2021-4.2", "examples/guideline36-2021-4.3-parallel-constant", "examples/guideline36-2021-4.3-parallel-variable", "examples/guideline36-2021-4.4", "examples/guideline36-2021-4.5", "examples/guideline36-2021-4.6", "examples/ibal", "examples/lbnl-example", "intro"], "filenames": ["examples/NREL-example.md", "examples/guideline36-2021-4.1.md", "examples/guideline36-2021-4.2.md", "examples/guideline36-2021-4.3-parallel-constant.md", "examples/guideline36-2021-4.3-parallel-variable.md", "examples/guideline36-2021-4.4.md", "examples/guideline36-2021-4.5.md", "examples/guideline36-2021-4.6.md", "examples/ibal.md", "examples/lbnl-example.md", "intro.md"], "titles": ["NREL Example Building", "ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit with Cooling Only", "ASHRAE Guideline 36-2021 4.2 VAV Terminal Unit with Reheat", "ASHRAE Guideline 36-2021 4.3 Parallel Fan Powered Unit With Constant Fan", "ASHRAE Guideline 36-2021 4.3 Parallel Fan Powered Unit With Variable Fan", "ASHRAE Guideline 36-2021 4.4 Dual Duct Terminal Unit With Inlet Sensors", "ASHRAE Guideline 36-2021 4.5 Dual Duct Terminal Unit With Discharge Sensor", "ASHRAE Guideline 36-2021 4.6 Multiple-Zone Air-Handling Unit", "NIST Intelligent Buildings Agents Laboratory", "LBNL Example Building", "Open223 Models"], "terms": {"thi": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], "an": [0, 1, 2, 3, 4, 5, 6, 7, 9], "provid": [0, 9, 10], "nation": [0, 9], "renew": 0, "energi": 0, "laboratori": [0, 9, 10], "built": 0, "buildingmotif": 0, "tool": 0, "turtl": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "file": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "json": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "ld": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "descript": [0, 8, 9], "url": [0, 8, 9], "zone": [0, 8, 9, 10], "room": [0, 8, 9], "temperatur": [0, 8, 9], "sensor": [0, 1, 2, 3, 4, 7, 8, 9, 10], "link": [0, 8, 9], "parent": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "class": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "instanc": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "equip": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], "131": 0, "valv": [0, 2, 3, 4, 7, 9], "41": [0, 9], "heatingcoil": [0, 2, 3, 4, 7, 8, 9], "19": [0, 8], "fan": [0, 7, 8, 9, 10], "13": 0, "pump": [0, 8], "12": [0, 7], "coolingcoil": [0, 7, 8, 9], "10": [0, 7, 8], "fancoilunit": 0, "9": [0, 3, 4, 7, 8], "terminalunit": [0, 8], "filter": [0, 7], "4": [0, 8, 10], "damper": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "heatexchang": [0, 8], "2": [0, 1, 3, 4, 5, 6, 7, 8, 9, 10], "heatrecoverycoil": 0, "airhandlingunit": [0, 7, 8, 9], "1": [0, 2, 3, 4, 5, 6, 7, 8, 9, 10], "connect": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], "duct": [0, 1, 2, 3, 4, 7, 9, 10], "57": 0, "connectionpoint": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "outletconnectionpoint": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "196": 0, "inletconnectionpoint": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "187": 0, "domainspac": [0, 8, 9], "15": 0, "3": [0, 2, 6, 8, 10], "properti": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "quantifiableobservableproperti": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "381": 0, "enumeratedobservableproperti": [0, 3, 4, 7, 9], "119": 0, "enumeratedactuatableproperti": [0, 3, 4, 7, 9], "66": 0, "quantifiableactuatableproperti": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "29": 0, "quantifiableproperti": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "6": [0, 1, 2, 3, 4, 5, 6, 8, 9, 10], "exampl": [1, 2, 3, 4, 5, 6, 7], "variabl": [1, 2, 10], "air": [1, 2, 8, 10], "volum": [1, 2], "from": [1, 2, 3, 4, 5, 6, 7], "section": [1, 2, 3, 4, 5, 6, 7], "illustr": [1, 3, 4, 5, 6, 7], "figur": [1, 3, 4, 5, 6, 7], "A": [1, 3, 4, 5, 6, 7], "actuat": [1, 2, 3, 4, 5, 6, 7, 9], "singleducttermin": [1, 2, 9], "pipe": [2, 3, 4, 7, 8, 9], "fanpoweredtermin": [3, 4], "5": [3, 4, 8, 10], "7": [3, 4, 5, 8], "dut": 5, "dualducttermin": [5, 6], "8": [6, 7], "ahu": 7, "differentialsensor": 7, "20": 7, "17": 7, "ibal": 8, "The": 8, "schemat": 8, "hydron": 8, "system": 8, "can": 8, "found": 8, "here": 8, "temperaturesensor": 8, "48": 8, "control": [8, 10], "40": [8, 9], "flowsensor": 8, "16": 8, "electricmet": 8, "11": 8, "pressuresensor": 8, "humiditysensor": 8, "variablefrequencydr": 8, "threewayvalv": 8, "twowayvalv": 8, "chiller": 8, "160": 8, "148": 8, "functionblock": 8, "137": 8, "lawrenc": 9, "berkelei": 9, "167": 9, "85": 9, "43": 9, "42": 9, "126": 9, "88": 9, "304": 9, "47": 9, "38": 9, "299": 9, "249": 9, "200": 9, "ashra": 10, "standard": 10, "223p": 10, "propos": 10, "formal": 10, "defin": 10, "knowledg": 10, "concept": 10, "repres": 10, "inform": 10, "between": 10, "mechan": 10, "space": 10, "within": 10, "measur": 10, "point": 10, "It": 10, "metadata": 10, "schema": 10, "semant": 10, "ontolog": 10, "construct": 10, "rule": 10, "need": 10, "interoper": 10, "machin": 10, "readabl": 10, "softwar": 10, "applic": 10, "abil": 10, "determin": 10, "essenti": 10, "about": 10, "mean": 10, "context": 10, "data": 10, "support": 10, "deploy": 10, "variou": 10, "advanc": 10, "featur": 10, "fault": 10, "detect": 10, "diagnost": 10, "autom": 10, "commiss": 10, "public": 10, "document": 10, "yet": 10, "publicli": 10, "publish": 10, "site": 10, "contain": 10, "other": 10, "asset": 10, "223": 10, "lbnl": 10, "nrel": 10, "nist": 10, "intellig": 10, "agent": 10, "guidelin": 10, "36": 10, "2021": 10, "vav": 10, "termin": 10, "unit": 10, "cool": 10, "onli": 10, "reheat": 10, "parallel": 10, "power": 10, "With": 10, "constant": 10, "dual": 10, "inlet": 10, "discharg": 10, "multipl": 10, "handl": 10}, "objects": {}, "objtypes": {}, "objnames": {}, "titleterms": {"nrel": 0, "exampl": [0, 9, 10], "build": [0, 8, 9, 10], "download": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "queri": [0, 2, 8, 9], "model": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], "compon": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "ashra": [1, 2, 3, 4, 5, 6, 7], "guidelin": [1, 2, 3, 4, 5, 6, 7], "36": [1, 2, 3, 4, 5, 6, 7], "2021": [1, 2, 3, 4, 5, 6, 7], "4": [1, 2, 3, 4, 5, 6, 7], "1": 1, "vav": [1, 2], "termin": [1, 2, 5, 6], "unit": [1, 2, 3, 4, 5, 6, 7], "cool": 1, "onli": 1, "2": 2, "reheat": 2, "3": [3, 4], "parallel": [3, 4], "fan": [3, 4], "power": [3, 4], "With": [3, 4, 5, 6], "constant": 3, "variabl": 4, "dual": [5, 6], "duct": [5, 6], "inlet": 5, "sensor": [5, 6], "5": 6, "discharg": 6, "6": 7, "multipl": 7, "zone": 7, "air": 7, "handl": 7, "nist": 8, "intellig": 8, "agent": 8, "laboratori": 8, "lbnl": 9, "open223": 10, "tabl": 10, "content": 10, "system": 10}, "envversion": {"sphinx.domains.c": 2, "sphinx.domains.changeset": 1, "sphinx.domains.citation": 1, "sphinx.domains.cpp": 6, "sphinx.domains.index": 1, "sphinx.domains.javascript": 2, "sphinx.domains.math": 2, "sphinx.domains.python": 3, "sphinx.domains.rst": 2, "sphinx.domains.std": 2, "sphinx.ext.intersphinx": 1, "sphinx": 56}})
\ No newline at end of file
+Search.setIndex({"docnames": ["examples/NREL-example", "examples/guideline36-2021-4.1", "examples/guideline36-2021-4.2", "examples/guideline36-2021-4.3-parallel-constant", "examples/guideline36-2021-4.3-parallel-variable", "examples/guideline36-2021-4.4", "examples/guideline36-2021-4.5", "examples/guideline36-2021-4.6", "examples/ibal", "examples/lbnl-example", "intro"], "filenames": ["examples/NREL-example.md", "examples/guideline36-2021-4.1.md", "examples/guideline36-2021-4.2.md", "examples/guideline36-2021-4.3-parallel-constant.md", "examples/guideline36-2021-4.3-parallel-variable.md", "examples/guideline36-2021-4.4.md", "examples/guideline36-2021-4.5.md", "examples/guideline36-2021-4.6.md", "examples/ibal.md", "examples/lbnl-example.md", "intro.md"], "titles": ["NREL Example Building", "ASHRAE Guideline 36-2021 4.1 VAV Terminal Unit with Cooling Only", "ASHRAE Guideline 36-2021 4.2 VAV Terminal Unit with Reheat", "ASHRAE Guideline 36-2021 4.3 Parallel Fan Powered Unit With Constant Fan", "ASHRAE Guideline 36-2021 4.3 Parallel Fan Powered Unit With Variable Fan", "ASHRAE Guideline 36-2021 4.4 Dual Duct Terminal Unit With Inlet Sensors", "ASHRAE Guideline 36-2021 4.5 Dual Duct Terminal Unit With Discharge Sensor", "ASHRAE Guideline 36-2021 4.6 Multiple-Zone Air-Handling Unit", "NIST Intelligent Buildings Agents Laboratory", "LBNL Example Building", "Open223 Models"], "terms": {"thi": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], "an": [0, 1, 2, 3, 4, 5, 6, 7, 9], "provid": [0, 9, 10], "nation": [0, 9], "renew": 0, "energi": 0, "laboratori": [0, 9, 10], "built": 0, "buildingmotif": 0, "tool": 0, "turtl": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "file": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "json": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "ld": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "descript": [0, 8, 9], "url": [0, 8, 9], "zone": [0, 8, 9, 10], "room": [0, 8, 9], "temperatur": [0, 8, 9], "sensor": [0, 1, 2, 3, 4, 7, 8, 9, 10], "link": [0, 8, 9], "parent": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "class": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "instanc": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "equip": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], "131": 0, "valv": [0, 2, 3, 4, 7, 9], "41": [0, 9], "heatingcoil": [0, 2, 3, 4, 7, 8, 9], "19": [0, 8], "fan": [0, 7, 8, 9, 10], "13": 0, "pump": [0, 8], "12": [0, 7], "coolingcoil": [0, 7, 8, 9], "10": [0, 7, 8], "fancoilunit": 0, "9": [0, 3, 4, 7, 8], "terminalunit": [0, 8], "filter": [0, 7], "4": [0, 8, 10], "damper": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "heatexchang": [0, 8], "2": [0, 1, 3, 4, 5, 6, 7, 8, 9, 10], "heatrecoverycoil": 0, "airhandlingunit": [0, 7, 8, 9], "1": [0, 2, 3, 4, 5, 6, 7, 8, 9, 10], "connect": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], "duct": [0, 1, 2, 3, 4, 7, 9, 10], "57": 0, "connectionpoint": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "outletconnectionpoint": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "196": 0, "inletconnectionpoint": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "187": 0, "domainspac": [0, 8, 9], "15": 0, "3": [0, 2, 6, 8, 10], "properti": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "quantifiableobservableproperti": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "381": 0, "enumeratedobservableproperti": [0, 3, 4, 7, 9], "119": 0, "enumeratedactuatableproperti": [0, 3, 4, 7, 9], "66": 0, "quantifiableactuatableproperti": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "29": 0, "quantifiableproperti": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "6": [0, 1, 2, 3, 4, 5, 6, 8, 9, 10], "exampl": [1, 2, 3, 4, 5, 6, 7], "variabl": [1, 2, 10], "air": [1, 2, 8, 10], "volum": [1, 2], "from": [1, 2, 3, 4, 5, 6, 7], "section": [1, 2, 3, 4, 5, 6, 7], "illustr": [1, 3, 4, 5, 6, 7], "figur": [1, 3, 4, 5, 6, 7], "A": [1, 3, 4, 5, 6, 7], "actuat": [1, 2, 3, 4, 5, 6, 7, 9], "singleducttermin": [1, 2, 9], "pipe": [2, 3, 4, 7, 8, 9], "fanpoweredtermin": [3, 4], "5": [3, 4, 8, 10], "7": [3, 4, 5, 8], "dut": 5, "dualducttermin": [5, 6], "8": [6, 7], "ahu": [7, 8], "differentialsensor": 7, "20": 7, "17": 7, "ibal": 8, "The": 8, "schemat": 8, "hydron": 8, "system": 8, "can": 8, "found": 8, "here": 8, "what": 8, "unit": [8, 10], "thei": 8, "ar": 8, "measur": [8, 10], "temperaturesensor": 8, "48": 8, "control": [8, 10], "40": [8, 9], "flowsensor": 8, "16": 8, "electricmet": 8, "11": 8, "pressuresensor": 8, "humiditysensor": 8, "variablefrequencydr": 8, "threewayvalv": 8, "twowayvalv": 8, "chiller": 8, "160": 8, "148": 8, "functionblock": 8, "137": 8, "lawrenc": 9, "berkelei": 9, "167": 9, "85": 9, "43": 9, "42": 9, "126": 9, "88": 9, "304": 9, "47": 9, "38": 9, "299": 9, "249": 9, "200": 9, "ashra": 10, "standard": 10, "223p": 10, "propos": 10, "formal": 10, "defin": 10, "knowledg": 10, "concept": 10, "repres": 10, "inform": 10, "between": 10, "mechan": 10, "space": 10, "within": 10, "point": 10, "It": 10, "metadata": 10, "schema": 10, "semant": 10, "ontolog": 10, "construct": 10, "rule": 10, "need": 10, "interoper": 10, "machin": 10, "readabl": 10, "softwar": 10, "applic": 10, "abil": 10, "determin": 10, "essenti": 10, "about": 10, "mean": 10, "context": 10, "data": 10, "support": 10, "deploy": 10, "variou": 10, "advanc": 10, "featur": 10, "fault": 10, "detect": 10, "diagnost": 10, "autom": 10, "commiss": 10, "public": 10, "document": 10, "yet": 10, "publicli": 10, "publish": 10, "site": 10, "contain": 10, "other": 10, "asset": 10, "223": 10, "lbnl": 10, "nrel": 10, "nist": 10, "intellig": 10, "agent": 10, "guidelin": 10, "36": 10, "2021": 10, "vav": 10, "termin": 10, "cool": 10, "onli": 10, "reheat": 10, "parallel": 10, "power": 10, "With": 10, "constant": 10, "dual": 10, "inlet": 10, "discharg": 10, "multipl": 10, "handl": 10}, "objects": {}, "objtypes": {}, "objnames": {}, "titleterms": {"nrel": 0, "exampl": [0, 9, 10], "build": [0, 8, 9, 10], "download": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "queri": [0, 2, 8, 9], "model": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], "compon": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], "ashra": [1, 2, 3, 4, 5, 6, 7], "guidelin": [1, 2, 3, 4, 5, 6, 7], "36": [1, 2, 3, 4, 5, 6, 7], "2021": [1, 2, 3, 4, 5, 6, 7], "4": [1, 2, 3, 4, 5, 6, 7], "1": 1, "vav": [1, 2], "termin": [1, 2, 5, 6], "unit": [1, 2, 3, 4, 5, 6, 7], "cool": 1, "onli": 1, "2": 2, "reheat": 2, "3": [3, 4], "parallel": [3, 4], "fan": [3, 4], "power": [3, 4], "With": [3, 4, 5, 6], "constant": 3, "variabl": 4, "dual": [5, 6], "duct": [5, 6], "inlet": 5, "sensor": [5, 6], "5": 6, "discharg": 6, "6": 7, "multipl": 7, "zone": 7, "air": 7, "handl": 7, "nist": 8, "intellig": 8, "agent": 8, "laboratori": 8, "lbnl": 9, "open223": 10, "tabl": 10, "content": 10, "system": 10}, "envversion": {"sphinx.domains.c": 2, "sphinx.domains.changeset": 1, "sphinx.domains.citation": 1, "sphinx.domains.cpp": 6, "sphinx.domains.index": 1, "sphinx.domains.javascript": 2, "sphinx.domains.math": 2, "sphinx.domains.python": 3, "sphinx.domains.rst": 2, "sphinx.domains.std": 2, "sphinx.ext.intersphinx": 1, "sphinx": 56}})
\ No newline at end of file